From 3a8557b17383b66c05e6e735316a2e2d2c389db3 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 15 Jul 2020 15:43:22 +0200 Subject: [PATCH 1/5] 2.235.1 --- README.md | 4 +--- README_fr.md | 4 +--- conf/app.src | 4 ++-- manifest.json | 2 +- scripts/install | 2 +- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 8379ba3..f6aa7a5 100644 --- a/README.md +++ b/README.md @@ -5,15 +5,13 @@ *[Lire ce readme en français.](./README_fr.md)* -> **This package doesn't work anymore on debian Jessie, because the last jenkins version which works on Jessie was 2.46.3, but the plugins aren't available anymore for this version.** - > *This package allow you to install jenkins quickly and simply on a YunoHost server. If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* ## Overview The leading open source automation server, Jenkins provides hundreds of plugins to support building, deploying and automating any project. -**Shipped version:** 2.164.2 +**Shipped version:** 2.235.1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 5c0807e..ce4af90 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,15 +5,13 @@ *[Read this readme in english.](./README.md)* -> **Ce package ne fonctionne plus sur debian Jessie, parce que la dernière version de jenkins qui fonctionne sur Jessie était la 2.46.3, mais les plugins ne sont plus disponibles pour cette version.** - > *Ce package vous permet d'installer jenkins rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, merci de regarder [ici](https://yunohost.org/#/install_fr) pour savoir comment l'installer et en profiter.* ## Résumé Premier serveur d'automatisation open source, Jenkins fournit des centaines de plugins pour supporter la construction, le déploiement et l'automatisation de n'importe quel projet. -**Version embarquée:** 2.164.2 +**Version embarquée:** 2.235.1 ## Captures d'écran diff --git a/conf/app.src b/conf/app.src index b51cf02..90d004c 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://pkg.jenkins.io/debian-stable/binary/jenkins_2.164.3_all.deb -SOURCE_SUM=183b98b12a23374273150741c9fea269 +SOURCE_URL=https://pkg.jenkins.io/debian-stable/binary/jenkins_2.235.1_all.deb +SOURCE_SUM=3f1c7e4d536557e88e4cc05d72ec9460 SOURCE_SUM_PRG=md5sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 78e1a72..3e809fa 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Extendable continuous integration server", "fr": "Serveur d'intégration continue extensible" }, - "version": "2.164.2~ynh1", + "version": "2.235.1~ynh1", "url": "https://jenkins.io/index.html", "license": "MIT", "maintainer": { diff --git a/scripts/install b/scripts/install index 681b9f7..e71a82e 100644 --- a/scripts/install +++ b/scripts/install @@ -187,7 +187,7 @@ do fi done -jenkins_cli="ynh_exec_warn_less java -jar /var/lib/jenkins/jenkins-cli.jar -remoting -s http://$domain$path_url" +jenkins_cli="ynh_exec_warn_less java -jar /var/lib/jenkins/jenkins-cli.jar -s http://${domain}:${port}${path_url}" # Install plugins for http authentication and ldap. $jenkins_cli install-plugin reverse-proxy-auth-plugin From 9e97a02cbed81fffd3816c25c8645882240d3135 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 15 Jul 2020 17:04:36 +0200 Subject: [PATCH 2/5] upgrade plugins --- scripts/upgrade | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index 78799f1..bb32670 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -162,6 +162,20 @@ ynh_script_progression --message="Upgrading jenkins-cli.phar..." wget -nv --no-check-certificate https://$domain$path_url/jnlpJars/jenkins-cli.jar -O /var/lib/jenkins/jenkins-cli.jar +#================================================= +# UPGRADE PLUGINS +#================================================= +ynh_script_progression --message="Upgrading plugins..." --weight=40 + +jenkins_cli="ynh_exec_warn_less java -jar /var/lib/jenkins/jenkins-cli.jar -s http://${domain}:${port}${path_url}" +UPDATE_LIST=$($jenkins_cli list-plugins | grep -e ')$' | awk '{ print $1 }' ) + +if [ -n "${UPDATE_LIST}" ]; then + $jenkins_cli install-plugin "${UPDATE_LIST}" +fi + +ynh_systemd_action --action=restart --line_match="Jenkins is fully up and running" --log_path="/var/log/$app/$app.log" --timeout="3600" + #================================================= # DEACTIVE MAINTENANCE MODE #================================================= From 018e148506e3d0953bda8fb79be8cecef5ca97c3 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 15 Jul 2020 18:51:16 +0200 Subject: [PATCH 3/5] set useSecurity to false during install/upgrade --- scripts/install | 7 +++++-- scripts/upgrade | 9 +++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index e71a82e..1b5ea60 100644 --- a/scripts/install +++ b/scripts/install @@ -175,7 +175,7 @@ ynh_systemd_action --action=restart --line_match="Jenkins is fully up and runnin ynh_script_progression --message="Installing plugins..." --weight=60 # If the log says that jenkins has started, install the plugins -wget -nv --no-check-certificate https://$domain$path_url/jnlpJars/jenkins-cli.jar -O /var/lib/jenkins/jenkins-cli.jar +wget -nv --no-check-certificate https://$domain${path_url%/}/jnlpJars/jenkins-cli.jar -O /var/lib/jenkins/jenkins-cli.jar for i in `seq 1 $timeout` do # Wait for an update of plugin repositories @@ -187,7 +187,10 @@ do fi done -jenkins_cli="ynh_exec_warn_less java -jar /var/lib/jenkins/jenkins-cli.jar -s http://${domain}:${port}${path_url}" +ynh_replace_string --match_string="true" --replace_string="false" --target_file=/var/lib/jenkins/config.xml +ynh_systemd_action --action=restart --line_match="Jenkins is fully up and running" --log_path="/var/log/$app/$app.log" --timeout="$timeout" + +jenkins_cli="ynh_exec_warn_less java -jar /var/lib/jenkins/jenkins-cli.jar -s http://${domain}:${port}${path_url%/}" # Install plugins for http authentication and ldap. $jenkins_cli install-plugin reverse-proxy-auth-plugin diff --git a/scripts/upgrade b/scripts/upgrade index bb32670..4a1933e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -160,20 +160,25 @@ ynh_systemd_action --action=restart --line_match="Jenkins is fully up and runnin #================================================= ynh_script_progression --message="Upgrading jenkins-cli.phar..." -wget -nv --no-check-certificate https://$domain$path_url/jnlpJars/jenkins-cli.jar -O /var/lib/jenkins/jenkins-cli.jar +wget -nv --no-check-certificate https://$domain${path_url%/}/jnlpJars/jenkins-cli.jar -O /var/lib/jenkins/jenkins-cli.jar #================================================= # UPGRADE PLUGINS #================================================= ynh_script_progression --message="Upgrading plugins..." --weight=40 -jenkins_cli="ynh_exec_warn_less java -jar /var/lib/jenkins/jenkins-cli.jar -s http://${domain}:${port}${path_url}" +ynh_replace_string --match_string="true" --replace_string="false" --target_file=/var/lib/jenkins/config.xml +ynh_systemd_action --action=restart --line_match="Jenkins is fully up and running" --log_path="/var/log/$app/$app.log" --timeout="3600" + +jenkins_cli="ynh_exec_warn_less java -jar /var/lib/jenkins/jenkins-cli.jar -s http://${domain}:${port}${path_url%/}" UPDATE_LIST=$($jenkins_cli list-plugins | grep -e ')$' | awk '{ print $1 }' ) if [ -n "${UPDATE_LIST}" ]; then $jenkins_cli install-plugin "${UPDATE_LIST}" fi +ynh_replace_string --match_string="false" --replace_string="true" --target_file=/var/lib/jenkins/config.xml + ynh_systemd_action --action=restart --line_match="Jenkins is fully up and running" --log_path="/var/log/$app/$app.log" --timeout="3600" #================================================= From 43ebe4710325237f648c61728c63b27f0c9aef4c Mon Sep 17 00:00:00 2001 From: Kay0u Date: Tue, 21 Jul 2020 10:42:14 +0200 Subject: [PATCH 4/5] Fix upgrade plugins --- scripts/upgrade | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 4a1933e..67cc22e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -155,6 +155,13 @@ ynh_script_progression --message="Restarting Jenkins..." --weight=25 # Wait for Jenkins to be fully started ynh_systemd_action --action=restart --line_match="Jenkins is fully up and running" --log_path="/var/log/$app/$app.log" --timeout="3600" +#================================================= +# DEACTIVE MAINTENANCE MODE +#================================================= +ynh_script_progression --message="Disabling maintenance mode..." --weight=6 + +ynh_maintenance_mode_OFF + #================================================= # UPGRADE JENKINS-CLI.PHAR #================================================= @@ -167,27 +174,22 @@ wget -nv --no-check-certificate https://$domain${path_url%/}/jnlpJars/jenkins-cl #================================================= ynh_script_progression --message="Upgrading plugins..." --weight=40 +cp /var/lib/jenkins/config.xml /var/lib/jenkins/config.xml.bak + ynh_replace_string --match_string="true" --replace_string="false" --target_file=/var/lib/jenkins/config.xml ynh_systemd_action --action=restart --line_match="Jenkins is fully up and running" --log_path="/var/log/$app/$app.log" --timeout="3600" jenkins_cli="ynh_exec_warn_less java -jar /var/lib/jenkins/jenkins-cli.jar -s http://${domain}:${port}${path_url%/}" UPDATE_LIST=$($jenkins_cli list-plugins | grep -e ')$' | awk '{ print $1 }' ) -if [ -n "${UPDATE_LIST}" ]; then - $jenkins_cli install-plugin "${UPDATE_LIST}" -fi - -ynh_replace_string --match_string="false" --replace_string="true" --target_file=/var/lib/jenkins/config.xml +for plugin in ${UPDATE_LIST} +do + $jenkins_cli install-plugin "$plugin" || true +done +mv /var/lib/jenkins/config.xml.bak /var/lib/jenkins/config.xml ynh_systemd_action --action=restart --line_match="Jenkins is fully up and running" --log_path="/var/log/$app/$app.log" --timeout="3600" -#================================================= -# DEACTIVE MAINTENANCE MODE -#================================================= -ynh_script_progression --message="Disabling maintenance mode..." --weight=6 - -ynh_maintenance_mode_OFF - #================================================= # SEND A README FOR THE ADMIN #================================================= From 8d0665dd40fb32dbf6d6d72dd911bf8562310d32 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Tue, 21 Jul 2020 10:43:27 +0200 Subject: [PATCH 5/5] 2.235.2 --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index f6aa7a5..1fc161c 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview The leading open source automation server, Jenkins provides hundreds of plugins to support building, deploying and automating any project. -**Shipped version:** 2.235.1 +**Shipped version:** 2.235.2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index ce4af90..9c58c84 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, merci de regarder [ici](https://yunohost.org/#/inst ## Résumé Premier serveur d'automatisation open source, Jenkins fournit des centaines de plugins pour supporter la construction, le déploiement et l'automatisation de n'importe quel projet. -**Version embarquée:** 2.235.1 +**Version embarquée:** 2.235.2 ## Captures d'écran diff --git a/conf/app.src b/conf/app.src index 90d004c..4b35df4 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://pkg.jenkins.io/debian-stable/binary/jenkins_2.235.1_all.deb -SOURCE_SUM=3f1c7e4d536557e88e4cc05d72ec9460 +SOURCE_URL=https://pkg.jenkins.io/debian-stable/binary/jenkins_2.235.2_all.deb +SOURCE_SUM=536f5486831243337312e7995a10b993 SOURCE_SUM_PRG=md5sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 3e809fa..f891f2a 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Extendable continuous integration server", "fr": "Serveur d'intégration continue extensible" }, - "version": "2.235.1~ynh1", + "version": "2.235.2~ynh1", "url": "https://jenkins.io/index.html", "license": "MIT", "maintainer": {