From 94ed5e46d8d5e3547e0589b10f6c82885cbd8f6d Mon Sep 17 00:00:00 2001
From: Ziv Lifshits <ziv.lifshits@gmail.com>
Date: Tue, 3 Sep 2019 18:41:59 +0300
Subject: [PATCH] Release v10.10 (#28)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* - Initial folder structure

* -Add hosts files with examples

* - Added hosts and group_vars/windows.yml

* - Add register_components.yml skeleton

* - Add requirements file

* - Update register components to run 1 by 1

* - Supports components registration order

* - Enable components installation

* cli-637, cli-670, Adding input parameters, aligning orchestrator, running all tasks and hosts parallely (#2)

* cli-637, cli-670, Adding input parameters, aligning orchestrator, running all tasks and hosts parallely

* changing authentication to credssp, cleaning solution

* changed the register component process

* Update cpm.yml

* Update pas-orchestrator.yml

* Update psm.yml

* Update pvwa.yml

* Update register_components.yml

* Cli 669 (#3)

* cli-637, cli-670, Adding input parameters, aligning orchestrator, running all tasks and hosts parallely

* changing authentication to credssp, cleaning solution

* changed the register component process

* update readme fil

* fixing README

* README fixes

* Added full Apache 2.0 License file (#4)

* Added full Apache 2.0 License file

* fixed company name and moved stuff around

* - Fixed templating error, fixed typo on readme (#6)

* - Fixed templating error, fixed typo on readme

* - Fixed funny yes

* set cpm registration to false (#5)

* - Added yamllint linter (#7)

* -Add Jenkinsfile (#9)

* -Add Jenkinsfile

* -Set requirements for tests

* -Fix typo

* -Expand yamllint checking on all yml files

* -Make testenv folder invisible

* -Ignore check hidden folders

* - Add Cyberark EULA (#8)

* - Organized facts from prompt (#10)

* -Name set_facts task (ansible-lint issue) (#12)

* Pas orchestrator readme changes (#11)

* -Add default values (#14)

* - Merge latest master to develop (#16)

* Change installation order for version 10.7 (#18)

* - Update components versions to release 10.7 (#20)

* § removing the need of pvwa ip in psm registration (#23)

* § changed requirements to v10.8 (#25)

* § changed requirements to v10.8

* Update requirements.yml

* § adding retry mechanism to pvwa (#27)

* - Ignore inteliJ folder

* Update roles versions to 10.10

* - Add chech install roles

* - Add chech install roles
---
 .gitignore        |  1 +
 requirements.yml  |  6 +++---
 tasks/pvwa.yml    | 33 ++++++++++++++++++++++++---------
 tests/Jenkinsfile |  7 +++++++
 4 files changed, 35 insertions(+), 12 deletions(-)

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 {