Skip to content

Commit

Permalink
Release AM 1.16.0 + SS 0.22.0
Browse files Browse the repository at this point in the history
  • Loading branch information
replaceafill committed May 16, 2024
1 parent b04a3b3 commit 8e167da
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions playbooks/archivematica-jammy/.Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion playbooks/archivematica-jammy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion playbooks/archivematica-jammy/requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion playbooks/archivematica-jammy/singlenode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

pre_tasks:

- include_vars: "vars-singlenode-1.15.yml"
- include_vars: "vars-singlenode-1.16.yml"
tags:
- "always"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 8e167da

Please sign in to comment.