1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/jenkins_ynh.git synced 2024-09-03 19:26:18 +02:00

Merge pull request #123 from YunoHost-Apps/testing

Several fixes
This commit is contained in:
yalh76 2023-08-04 19:50:25 +02:00 committed by GitHub
commit 0456881221
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 17 additions and 17 deletions

View file

@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
Extendable continuous integration server
**Shipped version:** 2.401.3~ynh1
**Shipped version:** 2.401.3~ynh2
## Screenshots

View file

@ -18,7 +18,7 @@ Si vous navez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
Serveur d'intégration continue extensible
**Version incluse :** 2.401.3~ynh1
**Version incluse :** 2.401.3~ynh2
## Captures décran

View file

@ -6,7 +6,7 @@
"en": "Extendable continuous integration server",
"fr": "Serveur d'intégration continue extensible"
},
"version": "2.401.3~ynh1",
"version": "2.401.3~ynh2",
"url": "https://jenkins.io/index.html",
"upstream": {
"license": "MIT",

View file

@ -5,7 +5,7 @@
#=================================================
# dependencies used by the app
pkg_dependencies="openjdk-11-jdk daemon net-tools"
pkg_dependencies="openjdk-11-jdk|openjdk-17-jdk daemon net-tools"
PLUGIN_CLI_VERSION=2.9.3

View file

@ -34,7 +34,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain)
# STOP SYSTEMD SERVICE
#=================================================
ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
ynh_systemd_action --service_name=$app --action="stop" --line_match="Stopped" --log_path="systemd"
#=================================================
# DECLARE DATA AND CONF FILES TO BACKUP
@ -59,7 +59,7 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
# START SYSTEMD SERVICE
#=================================================
ynh_systemd_action --service_name=$app --action="restart" --line_match="Started Jenkins Continuous Integration Server" --log_path="systemd"
ynh_systemd_action --service_name=$app --action="restart" --line_match="Started" --log_path="systemd"
#=================================================
# END OF SCRIPT

View file

@ -72,7 +72,7 @@ fi
#=================================================
ynh_script_progression --message="Stopping a systemd service..."
ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
ynh_systemd_action --service_name=$app --action="stop" --line_match="Stopped" --log_path="systemd"
#=================================================
# MODIFY URL IN NGINX CONF
@ -121,7 +121,7 @@ systemctl daemon-reload --quiet
ynh_script_progression --message="Starting a systemd service..."
# Start a systemd service
ynh_systemd_action --service_name=$app --action="start" --line_match="Started Jenkins Continuous Integration Server" --log_path="systemd"
ynh_systemd_action --service_name=$app --action="start" --line_match="Started" --log_path="systemd"
#=================================================
# RELOAD NGINX

View file

@ -141,7 +141,7 @@ ynh_replace_string --match_string="Environment=\"JENKINS_PORT=8080\"" --replace_
systemctl daemon-reload --quiet
ynh_systemd_action --service_name=$app --action="restart" --line_match="Started Jenkins Continuous Integration Server" --log_path="systemd"
ynh_systemd_action --service_name=$app --action="restart" --line_match="Started" --log_path="systemd"
if [[ $dpkg_install_failed -ge 1 ]]; then
dpkg --configure -a
@ -173,7 +173,7 @@ $jenkins_plugin_manager --plugins gradle # Gradle Plugin
$jenkins_plugin_manager --plugins workflow-aggregator # Pipeline
$jenkins_plugin_manager --plugins pipeline-stage-view # Pipeline: Stage View Plugin
$jenkins_plugin_manager --plugins git # Git plugin
$jenkins_plugin_manager --plugins github-organization-folder # GitHub Organization Folder Plugin
$jenkins_plugin_manager --plugins github-branch-source # GitHub Branch Source Plugin
$jenkins_plugin_manager --plugins subversion # Subversion Plug-in
$jenkins_plugin_manager --plugins email-ext # Email Extension Plugin
$jenkins_plugin_manager --plugins ssh-slaves # SSH Slaves plugin
@ -208,7 +208,7 @@ yunohost service add $app --description="Jenkins Continuous Integration Server"
ynh_script_progression --message="Starting a systemd service..."
# Start a systemd service
ynh_systemd_action --service_name=$app --action="restart" --line_match="Started Jenkins Continuous Integration Server" --log_path="systemd"
ynh_systemd_action --service_name=$app --action="restart" --line_match="Started" --log_path="systemd"
#=================================================
# SETUP SSOWAT

View file

@ -37,7 +37,7 @@ fi
#=================================================
ynh_script_progression --message="Stopping a systemd service..."
ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
ynh_systemd_action --service_name=$app --action="stop" --line_match="Stopped" --log_path="systemd"
#=================================================
# REMOVE DEPENDENCIES

View file

@ -89,7 +89,7 @@ ynh_replace_string --match_string="Environment=\"JENKINS_PORT=8080\"" --replace_
systemctl daemon-reload --quiet
ynh_systemd_action --service_name=$app --action="restart" --line_match="Started Jenkins Continuous Integration Server" --log_path="systemd"
ynh_systemd_action --service_name=$app --action="restart" --line_match="Started" --log_path="systemd"
#=================================================
# RESTORE THE APP MAIN DIR
@ -110,7 +110,7 @@ yunohost service add $app --description="Jenkins Continuous Integration Server"
#=================================================
ynh_script_progression --message="Starting a systemd service..."
ynh_systemd_action --service_name=$app --action="restart" --line_match="Started Jenkins Continuous Integration Server" --log_path="systemd"
ynh_systemd_action --service_name=$app --action="restart" --line_match="Started" --log_path="systemd"
#=================================================
# SEND A README FOR THE ADMIN

View file

@ -52,7 +52,7 @@ ynh_abort_if_errors
#=================================================
ynh_script_progression --message="Stopping a systemd service..."
ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
ynh_systemd_action --service_name=$app --action="stop" --line_match="Stopped" --log_path="systemd"
#=================================================
# ENSURE DOWNWARD COMPATIBILITY
@ -127,7 +127,7 @@ then
systemctl daemon-reload --quiet
ynh_systemd_action --service_name=$app --action="restart" --line_match="Started Jenkins Continuous Integration Server" --log_path="systemd"
ynh_systemd_action --service_name=$app --action="restart" --line_match="Started" --log_path="systemd"
fi
#=================================================
@ -186,7 +186,7 @@ yunohost service add $app --description="Jenkins Continuous Integration Server"
#=================================================
ynh_script_progression --message="Starting a systemd service..."
ynh_systemd_action --service_name=$app --action="restart" --line_match="Started Jenkins Continuous Integration Server" --log_path="systemd"
ynh_systemd_action --service_name=$app --action="restart" --line_match="Started" --log_path="systemd"
#=================================================
# SEND A README FOR THE ADMIN