Skip to content

Commit

Permalink
Release AM 1.17.0 + SS 0.23.0
Browse files Browse the repository at this point in the history
  • Loading branch information
replaceafill committed Dec 7, 2024
1 parent 534239e commit aad10f3
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/archivematica-upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
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.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()
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.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
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.16.x"
version: "stable/1.17.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.16.yml"
- include_vars: "vars-singlenode-1.17.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.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"
Expand Down

0 comments on commit aad10f3

Please sign in to comment.