Merge pull request #87 from cyberark/develop

Develop

Jenkinsfile

@@ -9,19 +9,6 @@ pipeline {
     shortCommit = sh(script: "git log -n 1 --pretty=format:'%h'", returnStdout: true).trim()
   }
   stages {
-    stage('Get role') {
-      steps {
-        sh '''
-            cd tests
-            rm -rf roles
-            mkdir roles
-            cd roles
-            git clone https://github.com/cyberark/psm
-            cd psm
-            git checkout ${shortCommit}
-        '''
-      }
-    }
     stage('Install virtual environment') {
       steps {
         sh '''
@@ -32,11 +19,6 @@ pipeline {
         '''
       }
     }
-    // stage('ansible-lint validation') {
-    //   steps {
-    //     sh '.testenv/bin/ansible-lint tasks/* defaults/* meta/*'
-    //   }
-    // }
     stage('yamllint validation') {
       steps {
         sh '''

tests/ansible.cfg

@@ -1,7 +1,7 @@
 [defaults]
 
 # Default path to roles directory
-roles_path         = ./roles
+roles_path         = ../../
 
 # Adds timestamp to each task and add a recap on the end of the playbook
 callback_whitelist = profile_tasks

tests/default.yml

@@ -4,24 +4,28 @@
   gather_facts: no
   tasks:
 
+    - name: Get roles directory dirname
+      set_fact:
+        roles_dirname: "{{ playbook_dir | dirname | basename }}"
+
     - name: download package from s3
       aws_s3:
         bucket: cloud-initiatives-pipeline-bucket
-        object: "Packages/v11.2/Privileged Session Manager-Rls-v11.2.zip"
+        object: "Packages/v11.3/Privileged Session Manager-Rls-v11.3.zip"
         dest: "/tmp/psm.zip"
         mode: get
       delegate_to: localhost
 
     - name: PSM Deployment
       include_role:
-        name: psm
+        name: "{{ roles_dirname }}"
       vars:
         - psm_extract: true
         - psm_official: false
         - psm_prerequisites: true
         - psm_install: true
         - psm_postinstall: true
-        - psm_hardening: true
+        - psm_hardening: false
         - psm_registration: false
         - psm_zip_file_path: "/tmp/psm.zip"
         - accept_eula: "yes"

vars/main.yml

@@ -1,3 +1,3 @@
 ---
 # vars file for psm
-psm_sha1_checksum: "b069e342fb89ed6cf4dd766b15ae9d09a6eb4702"
+psm_sha1_checksum: "4dc4bb0e296ef67479ce22564ea945c15ba3868b"