From 8f5c2fb5f60ba9eb9301b3cfa057c3a36ec6b20d Mon Sep 17 00:00:00 2001
From: Erez Samimi <erez.shirn@gmail.com>
Date: Thu, 10 Dec 2020 09:14:54 +0200
Subject: [PATCH] Rel 12.0 - master (#77)

* CLI-1638: add .net & v12.0
---
 Jenkinsfile                                   |  2 +-
 README.md                                     |  2 +-
 requirements.yml                              |  6 ++---
 .../pas-infrastructure/ec2-infrastructure.yml | 23 +++++++++++++++++--
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 9b43a08..7e9ee56 100644
--- 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.7"
+    CYBERARK_VERSION = "v12.0"
     ENV_TIMESTAMP = sh(script: "date +%s", returnStdout: true).trim()
   }
   stages {
diff --git a/README.md b/README.md
index ff2bc62..afdd888 100644
--- a/README.md
+++ b/README.md
@@ -135,7 +135,7 @@ Prior to running pas-orchestrator hosts file should be "updated" [https://github
 ## Pulling specific version example :
 
   ````
-  git clone -b v11.7 -s https://github.com/cyberark/pas-orchestrator.git
+  git clone -b v12.0 -s https://github.com/cyberark/pas-orchestrator.git
   ````
   
   Note : using the -s it saves about 10M of diskspace and doesn’t download the unnecessary stuff.
diff --git a/requirements.yml b/requirements.yml
index 819abf5..5381ae0 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -3,14 +3,14 @@
 # pvwa git repo
 - src: https://github.com/cyberark/pvwa.git
   scm: git
-  version: v11.7
+  version: v12.0
 
 # cpm git repo
 - src: https://github.com/cyberark/cpm.git
   scm: git
-  version: v11.7
+  version: v12.0
 
 # psm git repo
 - src: https://github.com/cyberark/psm.git
   scm: git
-  version: v11.7
+  version: v12.0
diff --git a/tests/playbooks/pas-infrastructure/ec2-infrastructure.yml b/tests/playbooks/pas-infrastructure/ec2-infrastructure.yml
index 01e2e9e..abaf8e5 100644
--- a/tests/playbooks/pas-infrastructure/ec2-infrastructure.yml
+++ b/tests/playbooks/pas-infrastructure/ec2-infrastructure.yml
@@ -192,6 +192,27 @@
       wait_for_connection:
         timeout: 600
 
+    - name: Get roles directory dirname
+      set_fact:
+        dotnet_installer_path: "C:\\ndp48-x86-x64-allos-enu.exe"
+
+    - name: Download .NET Framework 4.8
+      win_get_url:
+        url: https://download.visualstudio.microsoft.com/download/pr/014120d7-d689-4305-befd-3cb711108212/0fd66638cde16859462a6243a4629a50/ndp48-x86-x64-allos-enu.exe
+        dest: "{{ dotnet_installer_path }}"
+
+    - name: Install Microsoft .NET Framework 4.8
+      win_package:
+        path: "{{ dotnet_installer_path }}"
+        product_id: '{50e73eb2-10f7-4457-954a-6b06fccc7d04}'
+        arguments: /q /norestart
+      register: dotnet_install
+
+    - name: Delete .NET Framework Installer
+      win_file:
+        path: "{{ dotnet_installer_path }}"
+        state: absent
+
     - name: Copy diskpart script
       win_copy:
         src: files/diskpart.txt
@@ -231,8 +252,6 @@
     - name: Reboot PAS Machines to Apply Changes
       win_reboot:
           reboot_timeout: 300
-      when: domain_state.reboot_required
-      when: indomain == "yes"
 
 - hosts: localhost
   gather_facts: no