From aad10f3906f741914c9eb92427c5c3a12b540555 Mon Sep 17 00:00:00 2001 From: "Douglas Cerna (Soy Douglas)" Date: Fri, 6 Dec 2024 18:34:29 +0000 Subject: [PATCH] Release AM 1.17.0 + SS 0.23.0 --- .github/workflows/archivematica-upgrade.yml | 2 +- playbooks/archivematica-jammy/.Jenkinsfile | 6 +++--- playbooks/archivematica-jammy/README.md | 2 +- playbooks/archivematica-jammy/requirements.yml | 2 +- playbooks/archivematica-jammy/singlenode.yml | 2 +- .../{vars-singlenode-1.16.yml => vars-singlenode-1.17.yml} | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) rename playbooks/archivematica-jammy/{vars-singlenode-1.16.yml => vars-singlenode-1.17.yml} (96%) diff --git a/.github/workflows/archivematica-upgrade.yml b/.github/workflows/archivematica-upgrade.yml index d5c1de86..9c0db206 100644 --- a/.github/workflows/archivematica-upgrade.yml +++ b/.github/workflows/archivematica-upgrade.yml @@ -71,7 +71,7 @@ jobs: ansible-galaxy install -f -p roles/ -r ../../playbooks/archivematica-jammy/requirements.yml ansible-playbook -i localhost, playbook.yml \ -u ubuntu \ - -e "am_version=1.16" \ + -e "am_version=1.17" \ -e "archivematica_src_configure_am_site_url=http://archivematica" \ -e "archivematica_src_configure_ss_url=http://archivematica:8000" \ -v diff --git a/playbooks/archivematica-jammy/.Jenkinsfile b/playbooks/archivematica-jammy/.Jenkinsfile index 6b16e910..34ba234e 100644 --- a/playbooks/archivematica-jammy/.Jenkinsfile +++ b/playbooks/archivematica-jammy/.Jenkinsfile @@ -2,9 +2,9 @@ node { timestamps { stage('Get code') { // If environment variables are defined, honour them - env.AM_BRANCH = sh(script: 'echo ${AM_BRANCH:-"stable/1.16.x"}', returnStdout: true).trim() - env.AM_VERSION = sh(script: 'echo ${AM_VERSION:-"1.16"}', returnStdout: true).trim() - env.SS_BRANCH = sh(script: 'echo ${SS_BRANCH:-"stable/0.22.x"}', returnStdout: true).trim() + env.AM_BRANCH = sh(script: 'echo ${AM_BRANCH:-"stable/1.17.x"}', returnStdout: true).trim() + env.AM_VERSION = sh(script: 'echo ${AM_VERSION:-"1.17"}', returnStdout: true).trim() + env.SS_BRANCH = sh(script: 'echo ${SS_BRANCH:-"stable/0.23.x"}', returnStdout: true).trim() env.DEPLOYPUB_BRANCH = sh(script: 'echo ${DEPLOYPUB_BRANCH:-"master"}', returnStdout: true).trim() env.AMAUAT_BRANCH = sh(script: 'echo ${AMAUAT_BRANCH:-"master"}', returnStdout: true).trim() env.DISPLAY = sh(script: 'echo ${DISPLAY:-:50}', returnStdout: true).trim() diff --git a/playbooks/archivematica-jammy/README.md b/playbooks/archivematica-jammy/README.md index 24c5ebcf..e7cc8712 100644 --- a/playbooks/archivematica-jammy/README.md +++ b/playbooks/archivematica-jammy/README.md @@ -52,7 +52,7 @@ machine. -v ``` -6. The ansible playbook `singlenode.yml` specified in the Vagrantfile will provision using qa branches of archivematica. To provision using the stable 1.16.x/0.22.x branches, replace "vars-singlenode-qa.yml" with "vars-singlenode-1.16.yml" in `singlenode.yml`. You can also modify create a custom vars file and pass it instead (to modify role variables to deploy custom branches, etc.) +6. The ansible playbook `singlenode.yml` specified in the Vagrantfile will provision using qa branches of archivematica. To provision using the stable 1.17.x/0.23.x branches, replace "vars-singlenode-qa.yml" with "vars-singlenode-1.17.yml" in `singlenode.yml`. You can also modify create a custom vars file and pass it instead (to modify role variables to deploy custom branches, etc.) # Login and credentials diff --git a/playbooks/archivematica-jammy/requirements.yml b/playbooks/archivematica-jammy/requirements.yml index 648fb984..8d817090 100644 --- a/playbooks/archivematica-jammy/requirements.yml +++ b/playbooks/archivematica-jammy/requirements.yml @@ -17,7 +17,7 @@ name: "artefactual.nginx" - src: "https://github.com/artefactual-labs/ansible-archivematica-src" - version: "stable/1.16.x" + version: "stable/1.17.x" name: "artefactual.archivematica-src" - src: "https://github.com/artefactual-labs/ansible-clamav" diff --git a/playbooks/archivematica-jammy/singlenode.yml b/playbooks/archivematica-jammy/singlenode.yml index 015ff7c1..5ea58f23 100644 --- a/playbooks/archivematica-jammy/singlenode.yml +++ b/playbooks/archivematica-jammy/singlenode.yml @@ -3,7 +3,7 @@ pre_tasks: - - include_vars: "vars-singlenode-1.16.yml" + - include_vars: "vars-singlenode-1.17.yml" tags: - "always" diff --git a/playbooks/archivematica-jammy/vars-singlenode-1.16.yml b/playbooks/archivematica-jammy/vars-singlenode-1.17.yml similarity index 96% rename from playbooks/archivematica-jammy/vars-singlenode-1.16.yml rename to playbooks/archivematica-jammy/vars-singlenode-1.17.yml index 9527b049..f918456a 100644 --- a/playbooks/archivematica-jammy/vars-singlenode-1.16.yml +++ b/playbooks/archivematica-jammy/vars-singlenode-1.17.yml @@ -2,8 +2,8 @@ # archivematica-src role -archivematica_src_am_version: "stable/1.16.x" -archivematica_src_ss_version: "stable/0.22.x" +archivematica_src_am_version: "stable/1.17.x" +archivematica_src_ss_version: "stable/0.23.x" archivematica_src_ss_db_name: "SS" archivematica_src_ss_db_user: "ss"