diff --git a/issue_template.md b/.github/ISSUE_TEMPLATE.md similarity index 96% rename from issue_template.md rename to .github/ISSUE_TEMPLATE.md index 2fb4f8f..2729a6b 100644 --- a/issue_template.md +++ b/.github/ISSUE_TEMPLATE.md @@ -8,7 +8,7 @@ about: When creating a bug report, please use the following template to provide 1. *Read this whole template first.* 2. *Determine if you are on the right place:* - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* - - *Otherwise, the issue may be due to Jenkins itself. Refer to its documentation or repository for help.* + - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.* - *When in doubt, post here and we will figure it out together.* 3. *Delete the italic comments as you write over them below, and remove this guide.* --- @@ -31,7 +31,7 @@ about: When creating a bug report, please use the following template to provide - *If you performed a command from the CLI, the command itself is enough. For example:* ```sh - sudo yunohost app install jenkins + sudo yunohost app install the_app ``` - *If you used the webadmin, please perform the equivalent command from the CLI first.* - *If the error occurs in your browser, explain what you did:* diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..ef70e18 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,16 @@ +## Problem + +- *Description of why you made this PR* + +## Solution + +- *And how do you fix that problem* + +## PR Status + +- [ ] Code finished and ready to be reviewed/tested +- [ ] The fix/enhancement were manually tested (if applicable) + +## Automatic tests + +Automatic tests can be triggered on https://ci-apps-dev.yunohost.org/ *after creating the PR*, by commenting "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!". (N.B. : for this to work you need to be a member of the Yunohost-Apps organization) diff --git a/README.md b/README.md index 5223c39..2dd4d31 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,8 @@ + + # Jenkins for YunoHost [![Integration level](https://dash.yunohost.org/integration/jenkins.svg)](https://dash.yunohost.org/appci/app/jenkins) ![](https://ci-apps.yunohost.org/ci/badges/jenkins.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/jenkins.maintain.svg) @@ -5,49 +10,33 @@ *[Lire ce readme en français.](./README_fr.md)* -> *This package allows you to install Jenkins quickly and simply on a YunoHost server. +> *This package allows you to install Jenkins quickly and simply on a YunoHost server. If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* ## Overview -The leading open source automation server, Jenkins provides hundreds of plugins to support building, deploying and automating any project. -**Shipped version:** 2.277.4 +Extendable continuous integration server + +**Shipped version:** 2.289.1~ynh1 + + ## Screenshots -![](https://upload.wikimedia.org/wikipedia/commons/8/8d/Ansible-playbook-output-jenkins.png) +![](./doc/screenshots/screenshot1.png) -## Demo +## Disclaimers / important information -No demo available. +* Other infos that people should be aware of, such as: + * Use the admin panel of your Jenkins to configure this app. + +## Documentation and resources -## Configuration - -Use the admin panel of your Jenkins to configure this app. - -## Documentation - - * Official documentation: https://jenkins.io/doc/ - -## YunoHost specific features - -#### Multi-user support - -Supported, with LDAP and SSO. - -#### Supported architectures - -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/jenkins.svg)](https://ci-apps.yunohost.org/ci/apps/jenkins/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/jenkins.svg)](https://ci-apps-arm.yunohost.org/ci/apps/jenkins/) - -## Links - - * Report a bug: https://github.com/YunoHost-Apps/jenkins_ynh/issues - * App website: https://jenkins.io - * Upstream app repository: https://github.com/jenkinsci/jenkins - * YunoHost website: https://yunohost.org/ - ---- +* Official app website: https://jenkins.io +* Official user documentation: https://www.jenkins.io/doc/book/ +* Upstream app code repository: https://github.com/jenkinsci/jenkins +* YunoHost documentation for this app: https://yunohost.org/app_jenkins +* Report a bug: https://github.com/YunoHost-Apps/jenkins_ynh/issues ## Developer info @@ -59,3 +48,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/jenkins_ynh/tree/test or sudo yunohost app upgrade jenkins -u https://github.com/YunoHost-Apps/jenkins_ynh/tree/testing --debug ``` + +**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file diff --git a/README_fr.md b/README_fr.md index 8e554fa..e429f24 100644 --- a/README_fr.md +++ b/README_fr.md @@ -4,51 +4,35 @@ [![Installer Jenkins avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=jenkins) *[Read this readme in english.](./README.md)* +*[Lire ce readme en français.](./README_fr.md)* -> *Ce package vous permet d'installer Jenkins rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.* +> *Ce package vous permet d'installer Jenkins rapidement et simplement sur un serveur YunoHost. +Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* ## Vue d'ensemble -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 incluse :** 2.277.4 +Serveur d'intégration continue extensible + +**Version incluse :** 2.289.1~ynh1 + + ## Captures d'écran -![](https://crudelis.fr/lutim/w8DlycXB.png) +![](./doc/screenshots/screenshot1.png) -## Démo +## Avertissements / informations importantes -Aucune démo pour cette application. +* Other infos that people should be aware of, such as: + * Use the admin panel of your Jenkins to configure this app. + +## Documentations et ressources -## Configuration - -Utiliser le panneau d'administration de Jenkins pour configurer cette application. - -## Documentation - - * Documentation officielle : https://jenkins.io/doc/ - * Documentation YunoHost : Il n'y a pas d'autre documentation, n'hésitez pas à contribuer. - -## Caractéristiques spécifiques YunoHost - -#### Support multi-utilisateurs - -Supportée, avec LDAP et SSO. - -#### Architectures supportées - -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/jenkins.svg)](https://ci-apps.yunohost.org/ci/apps/jenkins/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/jenkins.svg)](https://ci-apps-arm.yunohost.org/ci/apps/jenkins/) - -## Liens - - * Signaler un bug : https://github.com/YunoHost-Apps/jenkins_ynh/issues - * Site de l'application : https://jenkins.io - * Dépôt de l'application principale : https://github.com/jenkinsci/jenkins - * Site web YunoHost : https://yunohost.org/ - ---- +* Site officiel de l'app : https://jenkins.io +* Documentation officielle utilisateur : https://www.jenkins.io/doc/book/ +* Dépôt de code officiel de l'app : https://github.com/jenkinsci/jenkins +* Documentation YunoHost pour cette app : https://yunohost.org/app_jenkins +* Signaler un bug : https://github.com/YunoHost-Apps/jenkins_ynh/issues ## Informations pour les développeurs @@ -60,3 +44,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/jenkins_ynh/tree/test ou sudo yunohost app upgrade jenkins -u https://github.com/YunoHost-Apps/jenkins_ynh/tree/testing --debug ``` + +**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file diff --git a/check_process b/check_process index 7360014..1d562c3 100644 --- a/check_process +++ b/check_process @@ -1,8 +1,8 @@ ;; Test complet ; Manifest - domain="domain.tld" (DOMAIN) - path="/path" (PATH) - is_public=1 (PUBLIC|public=1|private=0) + domain="domain.tld" + path="/path" + is_public=1 ; Checks pkg_linter=1 setup_sub_dir=1 @@ -21,6 +21,8 @@ upgrade=1 from_commit=e6cf48fdbcc7cac5c5147d4a7cc1ebfd9055bfef # 2.277.3~ynh1 upgrade=1 from_commit=3f0f52e24273e9da86ac2fa7000953b7734196a5 + # 2.277.4~ynh1 + upgrade=1 from_commit=36fdba9bbd201832f5707083b878ae967052ad6a backup_restore=1 multi_instance=0 port_already_use=1 (8080) @@ -40,3 +42,5 @@ Notification=none name=2.277.2~ynh1 ; commit=3f0f52e24273e9da86ac2fa7000953b7734196a5 name=2.277.3~ynh1 + ; commit=36fdba9bbd201832f5707083b878ae967052ad6a + name=2.277.4~ynh1 diff --git a/conf/app.src b/conf/app.src index c112703..b4d7e98 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://pkg.jenkins.io/debian-stable/binary/jenkins_2.277.4_all.deb -SOURCE_SUM=0e36ddbcc684d1148725742c4f37fae83f37da28a2bcdaae285747ee8c384dfc +SOURCE_URL=https://pkg.jenkins.io/debian-stable/binary/jenkins_2.289.1_all.deb +SOURCE_SUM=5651493ea8f9b761b4f35d952780ccc3e2ddfdf2b1cd1b1fc13291ca214232d7 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=true diff --git a/doc/.gitkeep b/doc/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md new file mode 100644 index 0000000..b639e06 --- /dev/null +++ b/doc/DISCLAIMER.md @@ -0,0 +1,3 @@ +* Other infos that people should be aware of, such as: + * Use the admin panel of your Jenkins to configure this app. + \ No newline at end of file diff --git a/doc/screenshots/.gitkeep b/doc/screenshots/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/doc/screenshots/screenshot1.png b/doc/screenshots/screenshot1.png new file mode 100644 index 0000000..0d0d50b Binary files /dev/null and b/doc/screenshots/screenshot1.png differ diff --git a/manifest.json b/manifest.json index adc91d9..bed03e8 100644 --- a/manifest.json +++ b/manifest.json @@ -6,8 +6,14 @@ "en": "Extendable continuous integration server", "fr": "Serveur d'intégration continue extensible" }, - "version": "2.277.4~ynh1", + "version": "2.289.1~ynh1", "url": "https://jenkins.io/index.html", + "upstream": { + "license": "MIT", + "website": "https://jenkins.io", + "userdoc": "https://www.jenkins.io/doc/book/", + "code": "https://github.com/jenkinsci/jenkins" + }, "license": "MIT", "maintainer": { "name": "", diff --git a/pull_request_template.md b/pull_request_template.md deleted file mode 100644 index 6c28fc5..0000000 --- a/pull_request_template.md +++ /dev/null @@ -1,16 +0,0 @@ -## Problem -- *Description of why you made this PR* - -## Solution -- *And how do you fix that problem* - -## PR Status -- [ ] Code finished. -- [ ] Tested with Package_check. -- [ ] Fix or enhancement tested. -- [ ] Upgrade from last version tested. -- [ ] Can be reviewed and tested. - -## Package_check results ---- -* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"* diff --git a/scripts/upgrade b/scripts/upgrade index 90405df..bf99408 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -30,6 +30,33 @@ ynh_script_progression --message="Checking version..." upgrade_type=$(ynh_check_app_version_changed) +#================================================= +# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP +#================================================= +ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." + +# Backup the current version of the app +ynh_backup_before_upgrade +ynh_clean_setup () { + ynh_clean_check_starting + # Restore it if the upgrade fails + ynh_restore_upgradebackup +} +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors + +ynh_backup_if_checksum_is_different --file="/etc/default/jenkins" +ynh_backup_if_checksum_is_different --file="$final_path/config.xml" + +#================================================= +# STANDARD UPGRADE STEPS +#================================================= +# STOP SYSTEMD SERVICE +#================================================= +ynh_script_progression --message="Stopping a systemd service..." + +ynh_systemd_action --service_name=$app --action="stop" --line_match="Stopped LSB" --log_path="systemd" + #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= @@ -64,33 +91,6 @@ if ! ynh_permission_exists --permission="github-webhook"; then ynh_permission_create --permission="github-webhook" --url "/github-webhook" --allowed="visitors" --show_tile="false" --protected="true" fi -#================================================= -# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP -#================================================= -ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." - -# Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup () { - ynh_clean_check_starting - # Restore it if the upgrade fails - ynh_restore_upgradebackup -} -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - -ynh_backup_if_checksum_is_different --file="/etc/default/jenkins" -ynh_backup_if_checksum_is_different --file="$final_path/config.xml" - -#================================================= -# STANDARD UPGRADE STEPS -#================================================= -# STOP SYSTEMD SERVICE -#================================================= -ynh_script_progression --message="Stopping a systemd service..." - -ynh_systemd_action --service_name=$app --action="stop" --line_match="Stopped LSB" --log_path="systemd" - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #=================================================