diff --git a/pipelines/shared/Jenkinsfile b/pipelines/shared/Jenkinsfile index e694796..1b85910 100644 --- a/pipelines/shared/Jenkinsfile +++ b/pipelines/shared/Jenkinsfile @@ -90,7 +90,7 @@ pipeline { BROKER_URL = "https://broker.io.nrs.gov.bc.ca" HTTP_PROXY = "http://test-forwardproxy.nrs.bcgov:23128" PODMAN_ANSIBLE_INVENTORY_PATH = "${params.devInventoryPath}" - ANSIBLE_COLLECTION_VERSION = "${params.ansibleCollectionBranchTag != null && params.ansibleCollectionBranchTag != "" ? ",${params.ansibleCollectionBranchTag}" : ",v2.0.3"}" + ANSIBLE_COLLECTION_VERSION = "${params.ansibleCollectionBranchTag != null && params.ansibleCollectionBranchTag != "" ? ",${params.ansibleCollectionBranchTag}" : ",v2.0.4"}" PODMAN_ANSIBLE_COLLECTION_URL = "github.com/bcgov/nr-polaris-collection.git#polaris/deploy${env.ANSIBLE_COLLECTION_VERSION}" PODMAN_ANSIBLE_COLLECTION_PATH = "./collections/ansible_collections" GIT_CREDS = credentials('ci-user') @@ -161,6 +161,9 @@ pipeline { vaultApp.revokeToken() intention.endAction("configure") intention.startAction("install") + intention.openResponse.actions.each { key, value -> + env."ACTION_TOKEN_${key.toUpperCase()}" = "${value.token}" + } podman = new Podman(this) podman.login(authfile: "${env.AUTHFILE}", options: "-u ${env.REGISTRY_USERNAME} -p ${env.REGISTRY_PASSWORD}") podman.run("willhallonline/ansible:2.12-alpine-3.16", @@ -174,7 +177,7 @@ pipeline { -v \$(pwd)/infra/inventory:/ansible/inventory \ -v \$(pwd)/files/ansible/ansible.cfg:/etc/ansible/ansible.cfg \ -v \$(pwd)/downloads:/ansible/downloads \ - -e PODMAN_*", + -e PODMAN_* -e ACTION_TOKEN_*", command: 'ansible-playbook -i inventory/${PODMAN_ANSIBLE_INVENTORY_PATH} \ app/playbooks/playbook.yaml --extra-vars "env_vars=dev"') podman.logout(authfile: "${env.AUTHFILE}") @@ -227,7 +230,7 @@ pipeline { BROKER_URL = "https://nr-broker.apps.silver.devops.gov.bc.ca" HTTP_PROXY = "http://test-forwardproxy.nrs.bcgov:23128" PODMAN_ANSIBLE_INVENTORY_PATH = "${params.testInventoryPath}" - ANSIBLE_COLLECTION_VERSION = "${params.ansibleCollectionBranchTag != null && params.ansibleCollectionBranchTag != "" ? ",${params.ansibleCollectionBranchTag}" : ",v2.0.3"}" + ANSIBLE_COLLECTION_VERSION = "${params.ansibleCollectionBranchTag != null && params.ansibleCollectionBranchTag != "" ? ",${params.ansibleCollectionBranchTag}" : ",v2.0.4"}" PODMAN_ANSIBLE_COLLECTION_URL = "github.com/bcgov/nr-polaris-collection.git#polaris/deploy${env.ANSIBLE_COLLECTION_VERSION}" PODMAN_ANSIBLE_COLLECTION_PATH = "./collections/ansible_collections" GIT_CREDS = credentials('ci-user') @@ -298,6 +301,9 @@ pipeline { vaultApp.revokeToken() intention.endAction("configure") intention.startAction("install") + intention.openResponse.actions.each { key, value -> + env."ACTION_TOKEN_${key.toUpperCase()}" = "${value.token}" + } podman = new Podman(this) podman.login(authfile: "${env.AUTHFILE}", options: "-u ${env.REGISTRY_USERNAME} -p ${env.REGISTRY_PASSWORD}") podman.run("willhallonline/ansible:2.12-alpine-3.16", @@ -311,7 +317,7 @@ pipeline { -v \$(pwd)/infra/inventory:/ansible/inventory \ -v \$(pwd)/files/ansible/ansible.cfg:/etc/ansible/ansible.cfg \ -v \$(pwd)/downloads:/ansible/downloads \ - -e PODMAN_*", + -e PODMAN_* -e ACTION_TOKEN_*", command: 'ansible-playbook -i inventory/${PODMAN_ANSIBLE_INVENTORY_PATH} \ app/playbooks/playbook.yaml --extra-vars "env_vars=test"') podman.logout(authfile: "${env.AUTHFILE}") @@ -375,7 +381,7 @@ pipeline { BROKER_URL = "https://nr-broker.apps.silver.devops.gov.bc.ca" HTTP_PROXY = "http://test-forwardproxy.nrs.bcgov:23128" PODMAN_ANSIBLE_INVENTORY_PATH = "${params.prodInventoryPath}" - ANSIBLE_COLLECTION_VERSION = "${params.ansibleCollectionBranchTag != null && params.ansibleCollectionBranchTag != "" ? ",${params.ansibleCollectionBranchTag}" : ",v2.0.3"}" + ANSIBLE_COLLECTION_VERSION = "${params.ansibleCollectionBranchTag != null && params.ansibleCollectionBranchTag != "" ? ",${params.ansibleCollectionBranchTag}" : ",v2.0.4"}" PODMAN_ANSIBLE_COLLECTION_URL = "github.com/bcgov/nr-polaris-collection.git#polaris/deploy${env.ANSIBLE_COLLECTION_VERSION}" PODMAN_ANSIBLE_COLLECTION_PATH = "./collections/ansible_collections" GIT_CREDS = credentials('ci-user') @@ -446,6 +452,9 @@ pipeline { vaultApp.revokeToken() intention.endAction("configure") intention.startAction("install") + intention.openResponse.actions.each { key, value -> + env."ACTION_TOKEN_${key.toUpperCase()}" = "${value.token}" + } podman = new Podman(this) podman.login(authfile: "${env.AUTHFILE}", options: "-u ${env.REGISTRY_USERNAME} -p ${env.REGISTRY_PASSWORD}") podman.run("willhallonline/ansible:2.12-alpine-3.16", @@ -459,7 +468,7 @@ pipeline { -v \$(pwd)/infra/inventory:/ansible/inventory \ -v \$(pwd)/files/ansible/ansible.cfg:/etc/ansible/ansible.cfg \ -v \$(pwd)/downloads:/ansible/downloads \ - -e PODMAN_*", + -e PODMAN_* -e ACTION_TOKEN_*", command: 'ansible-playbook -i inventory/${PODMAN_ANSIBLE_INVENTORY_PATH} \ app/playbooks/playbook.yaml --extra-vars "env_vars=prod"') podman.logout(authfile: "${env.AUTHFILE}")