diff --git a/.gitignore b/.gitignore index 39debfa..d96d0fd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # ignore all retries files *.retry +.idea/* # ignore components symlink roles/cpm diff --git a/requirements.yml b/requirements.yml index 5b8fd65..c7b1f28 100644 --- a/requirements.yml +++ b/requirements.yml @@ -3,14 +3,14 @@ # pvwa git repo - src: https://github.com/cyberark/pvwa.git scm: git - version: v10.8.1 + version: v10.10 # cpm git repo - src: https://github.com/cyberark/cpm.git scm: git - version: v10.8 + version: v10.10 # psm git repo - src: https://github.com/cyberark/psm.git scm: git - version: v10.8 + version: v10.10 diff --git a/tasks/pvwa.yml b/tasks/pvwa.yml index 656f1eb..6475ae6 100644 --- a/tasks/pvwa.yml +++ b/tasks/pvwa.yml @@ -1,11 +1,26 @@ --- -- include_role: - name: pvwa - vars: - - pvwa_extract: true - - pvwa_prerequisites: true - - pvwa_install: true - - pvwa_postinstall: true - - pvwa_hardening: true - - pvwa_registration: false +- name: PVWA Role Block + block: + + - include_role: + name: pvwa + vars: + - pvwa_extract: true + - pvwa_prerequisites: true + - pvwa_install: true + - pvwa_postinstall: true + - pvwa_hardening: true + - pvwa_registration: false + + rescue: + + - include_role: + name: pvwa + vars: + - pvwa_extract: true + - pvwa_prerequisites: true + - pvwa_install: true + - pvwa_postinstall: true + - pvwa_hardening: true + - pvwa_registration: false diff --git a/tests/Jenkinsfile b/tests/Jenkinsfile index df956fb..fa3bf37 100644 --- a/tests/Jenkinsfile +++ b/tests/Jenkinsfile @@ -22,6 +22,13 @@ pipeline { } } } + stage('Install roles') { + steps { + script { + sh(script: ".testenv/bin/ansible-galaxy install -r requirements.yml --roles-path ./roles --force", returnStdout: true) + } + } + } stage('yamllint validation') { steps { script {