Merge pull request #61 from cyberark/develop

v11.4 Release
cyberark · Apr 12, 2020 · 4ba5384 · 4ba5384
2 parents d1942b3 + 8298d34
commit 4ba5384
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -7,7 +7,7 @@ pipeline {
   environment {
     AWS_REGION = sh(script: 'curl -s http://169.254.169.254/latest/dynamic/instance-identity/document | python3 -c "import json,sys;obj=json.load(sys.stdin);print (obj[\'region\'])"', returnStdout: true).trim()
     // shortCommit = sh(script: "git log -n 1 --pretty=format:'%h'", returnStdout: true).trim()
-    CYBERARK_VERSION = "v11.3"
+    CYBERARK_VERSION = "v11.4"
     ENV_TIMESTAMP = sh(script: "date +%s", returnStdout: true).trim()
   }
   stages {

diff --git a/requirements.yml b/requirements.yml
@@ -3,14 +3,14 @@
 # pvwa git repo
 - src: https://github.com/cyberark/pvwa.git
   scm: git
-  version: v11.3
+  version: v11.4
 
 # cpm git repo
 - src: https://github.com/cyberark/cpm.git
   scm: git
-  version: v11.3
+  version: v11.4
 
 # psm git repo
 - src: https://github.com/cyberark/psm.git
   scm: git
-  version: v11.3
+  version: v11.4
diff --git a/tests/playbooks/deploy_vault.yml b/tests/playbooks/deploy_vault.yml
@@ -43,7 +43,7 @@
         name: cf_deploy
       vars:
         - deploy_bucket: cloud-initiatives-pipeline-bucket
-        - cf_template_url: https://raw.githubusercontent.com/cyberark/pas-on-cloud/v11.3/aws/Vault-Single-Deployment.yaml
+        - cf_template_url: https://raw.githubusercontent.com/cyberark/pas-on-cloud/v11.3.1/aws/Vault-Single-Deployment.yaml
         - cf_template_parameters:
             EULA: Accept
             KeyName: "{{ keypair }}"

diff --git a/tests/playbooks/deploy_vaultdr.yml b/tests/playbooks/deploy_vaultdr.yml
@@ -43,7 +43,7 @@
         name: cf_deploy
       vars:
         - deploy_bucket: cloud-initiatives-pipeline-bucket
-        - cf_template_url: https://raw.githubusercontent.com/cyberark/pas-on-cloud/v11.3/aws/DRVault-Single-Deployment.yaml
+        - cf_template_url: https://raw.githubusercontent.com/cyberark/pas-on-cloud/v11.3.1/aws/DRVault-Single-Deployment.yaml
         - cf_template_parameters:
             EULA: Accept
             KeyName: "{{ keypair }}"

diff --git a/tests/playbooks/roles/cf_deploy/tasks/main.yml b/tests/playbooks/roles/cf_deploy/tasks/main.yml
@@ -6,7 +6,7 @@
 
 - name: Set String for CloudFormation Stack ID
   set_fact:
-    cloudformation_stack_id: "ansible-cloudformation-{{ lookup('pipe','date +%Y-%m-%d-%H-%M-%S') }}"
+    cloudformation_stack_id: "ACF-{{ lookup('pipe','date +%Y-%m-%d-%H-%M-%S') }}"
 
 - name: Create workspace directory on temp folder
   file: