From 8e167da69ba6405e908eba06f96632c4e1bc8de9 Mon Sep 17 00:00:00 2001
From: "Douglas Cerna (Soy Douglas)" <douglascerna@yahoo.com>
Date: Thu, 16 May 2024 23:20:18 +0200
Subject: [PATCH] Release AM 1.16.0 + SS 0.22.0

---
 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.15.yml => vars-singlenode-1.16.yml}  | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename playbooks/archivematica-jammy/{vars-singlenode-1.15.yml => vars-singlenode-1.16.yml} (96%)

diff --git a/playbooks/archivematica-jammy/.Jenkinsfile b/playbooks/archivematica-jammy/.Jenkinsfile
index a4c1d863..6b16e910 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.15.x"}', returnStdout: true).trim()
-      env.AM_VERSION = sh(script: 'echo ${AM_VERSION:-"1.15"}', returnStdout: true).trim()
-      env.SS_BRANCH = sh(script: 'echo ${SS_BRANCH:-"stable/0.21.x"}', returnStdout: true).trim()
+      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.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 34562d4d..8e728ba8 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.15.x/0.21.x branches, replace "vars-singlenode-qa.yml" with "vars-singlenode-1.15.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.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.)
 
 7. If you get errors regarding the Vagrant shared folders, they are usually due
 to different versions of VirtualBox. One way to fix it is using a vagrant
diff --git a/playbooks/archivematica-jammy/requirements.yml b/playbooks/archivematica-jammy/requirements.yml
index 95ac4730..648fb984 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.15.x"
+  version: "stable/1.16.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 423a87ac..015ff7c1 100644
--- a/playbooks/archivematica-jammy/singlenode.yml
+++ b/playbooks/archivematica-jammy/singlenode.yml
@@ -3,7 +3,7 @@
 
   pre_tasks:
 
-    - include_vars: "vars-singlenode-1.15.yml"
+    - include_vars: "vars-singlenode-1.16.yml"
       tags:
         - "always"
 
diff --git a/playbooks/archivematica-jammy/vars-singlenode-1.15.yml b/playbooks/archivematica-jammy/vars-singlenode-1.16.yml
similarity index 96%
rename from playbooks/archivematica-jammy/vars-singlenode-1.15.yml
rename to playbooks/archivematica-jammy/vars-singlenode-1.16.yml
index 93018a48..f591426e 100644
--- a/playbooks/archivematica-jammy/vars-singlenode-1.15.yml
+++ b/playbooks/archivematica-jammy/vars-singlenode-1.16.yml
@@ -2,8 +2,8 @@
 
 # archivematica-src role
 
-archivematica_src_am_version: "stable/1.15.x"
-archivematica_src_ss_version: "stable/0.21.x"
+archivematica_src_am_version: "stable/1.16.x"
+archivematica_src_ss_version: "stable/0.22.x"
 
 archivematica_src_ss_db_name: "SS"
 archivematica_src_ss_db_user: "ss"