From 8ac19836955b85c79b0e629be1549e419877333a Mon Sep 17 00:00:00 2001
From: Srinivas Uppoju <su671781@broadcom.net>
Date: Mon, 25 Oct 2021 07:34:15 +0100
Subject: [PATCH 01/27] US769866: Jenkins build migration

---
 Jenkinsfile | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 Jenkinsfile

diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 00000000..db56ac5d
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,20 @@
+@Library('apim-jenkins-lib@master') _
+
+pipeline {
+    agent { label 'ng2AgentStable' }
+    environment {
+        ANDROID_HOME ='/Users/qa/Library/Android/sdk'
+        ADB = '${ANDROID_HOME}/platform-tools/adb'
+        GATEWAY_VERSION = 'latest'
+        JAVA_HOME = '/usr/java/jdk1.8.0_275'
+    }
+    stages {
+        stage('Build') {
+            steps {
+                script {
+                    sh './gradlew assembleAndroidTest build'
+                }
+            }
+        }
+    }
+}
\ No newline at end of file

From 45627670913f781f9dfa08f0dc78c270098f0dd9 Mon Sep 17 00:00:00 2001
From: Srinivas Uppoju <su671781@broadcom.net>
Date: Mon, 25 Oct 2021 09:46:10 +0100
Subject: [PATCH 02/27] Migrate mas sdk release build

---
 Jenkinsfile-Release | 62 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 Jenkinsfile-Release

diff --git a/Jenkinsfile-Release b/Jenkinsfile-Release
new file mode 100644
index 00000000..20ed8808
--- /dev/null
+++ b/Jenkinsfile-Release
@@ -0,0 +1,62 @@
+@Library('apim-jenkins-lib@master') _
+
+pipeline {
+    agent { label 'ng2AgentStable' }
+    parameters {
+            string(name: 'sdk_version', defaultValue: '2.1.00', description: 'Android SDK Version')
+    }
+    environment {
+        ANDROID_HOME ='/Users/qa/Library/Android/sdk'
+        BUILD_PATH = '/Users/qa/Documents/iOSRepos/buildScript'
+        BUILD_HOST = 'localhost'
+        BUILD_USER = 'qa'
+        BUILD_PASSWORD = '7layer'
+        MODULE = 'all'
+        ZIP_NAME = 'MobileSDK'
+        JAVA_HOME = '/usr/java/jdk1.8.0_275'
+    }
+    stages {
+        stage('Clean Filer3 Folder and the local folder') {
+            steps {
+                script {
+                    sh '''#!/bin/bash
+                        #Delete and Re-create local SDK folder
+                        rm -rf $ZIP_NAME
+                        sudo mkdir $ZIP_NAME
+
+                        #Clear MobileSDK-Hotfix-Binaries folder on filer3
+                        chmod 777 ../../../../../../Volumes/wip/mag/MobileSDK-Hotfix-Binaries/
+                        cd ../../../../../../Volumes/wip/mag/MobileSDK-Hotfix-Binaries/
+                        [ -d $BUILD_BRANCH ] && echo "Directory Exists" || mkdir $BUILD_BRANCH
+                        chmod 777 $BUILD_BRANCH
+                        cd $BUILD_BRANCH/
+                        rm -rf *
+                    '''
+                }
+            }
+        }
+        stage('Build Android SDK - Gradle and copy to MobileSDK folder') {
+            steps {
+                script {
+                    sh '''#!/bin/bash
+                        cat /dev/null > settings.gradle
+                        printf "include ':mas', ':masui', ':mas-connecta', ':mas-storage',  ':mas-foundation', ':mas-test'" > settings.gradle
+                        ./gradlew build
+
+                        # Copy binaries to local folder MobileSDK
+                        cp mas-foundation/build/outputs/aar/mas-foundation-release.aar ../../$ZIP_NAME/mas-foundation-${params.sdk_version}-$BUILD_NUMBER.aar
+                        cp mas-connecta/build/outputs/aar/mas-connecta-release.aar ../../$ZIP_NAME/mas-connecta-${params.sdk_version}-$BUILD_NUMBER.aar
+                        cp mas-storage/build/outputs/aar/mas-storage-release.aar ../../$ZIP_NAME/mas-storage-${params.sdk_version}-$BUILD_NUMBER.aar
+                        cp masui/build/outputs/aar/masui-release.aar ../../$ZIP_NAME/masui-${params.sdk_version}-$BUILD_NUMBER.aar
+
+                        # Zip and Copy javadoc to folder MobileSDK
+                        cd docs
+                        zip -r mas_foundation_javadoc.zip mas_foundation_javadoc/
+                        zip -r mas_storage_javadoc.zip mas_storage_javadoc/
+                        zip -r mas_connecta_javadoc.zip mas_connecta_javadoc/
+
+                        sudo cp *.zip ../../../$ZIP_NAME/
+                    '''
+        }
+    }
+}
\ No newline at end of file

From 75af72c6eca1592d4332a7286c2b75a0a92a0fd6 Mon Sep 17 00:00:00 2001
From: Srinivas Uppoju <su671781@broadcom.net>
Date: Mon, 25 Oct 2021 09:51:36 +0100
Subject: [PATCH 03/27] Migrate mas sdk release build

---
 Jenkinsfile-Release | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile-Release b/Jenkinsfile-Release
index 20ed8808..dcaebc96 100644
--- a/Jenkinsfile-Release
+++ b/Jenkinsfile-Release
@@ -56,7 +56,8 @@ pipeline {
                         zip -r mas_connecta_javadoc.zip mas_connecta_javadoc/
 
                         sudo cp *.zip ../../../$ZIP_NAME/
-                    '''
+                }       '''
+            }
         }
     }
 }
\ No newline at end of file

From 08abf21b9df89afe01c511341aadfce635b87243 Mon Sep 17 00:00:00 2001
From: Srinivas Uppoju <su671781@broadcom.net>
Date: Mon, 25 Oct 2021 09:58:14 +0100
Subject: [PATCH 04/27] Migrate mas sdk release build

---
 Jenkinsfile-Release | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile-Release b/Jenkinsfile-Release
index dcaebc96..ea86aa5f 100644
--- a/Jenkinsfile-Release
+++ b/Jenkinsfile-Release
@@ -56,7 +56,8 @@ pipeline {
                         zip -r mas_connecta_javadoc.zip mas_connecta_javadoc/
 
                         sudo cp *.zip ../../../$ZIP_NAME/
-                }       '''
+                    '''
+                }
             }
         }
     }

From 3304722ec389a3ddbb506c5d7e9da9ab50c6d90b Mon Sep 17 00:00:00 2001
From: Srinivas Uppoju <su671781@broadcom.net>
Date: Mon, 25 Oct 2021 10:07:25 +0100
Subject: [PATCH 05/27] Migrate mas sdk release build

---
 Jenkinsfile-Release | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile-Release b/Jenkinsfile-Release
index ea86aa5f..af3ce1eb 100644
--- a/Jenkinsfile-Release
+++ b/Jenkinsfile-Release
@@ -27,9 +27,9 @@ pipeline {
                         #Clear MobileSDK-Hotfix-Binaries folder on filer3
                         chmod 777 ../../../../../../Volumes/wip/mag/MobileSDK-Hotfix-Binaries/
                         cd ../../../../../../Volumes/wip/mag/MobileSDK-Hotfix-Binaries/
-                        [ -d $BUILD_BRANCH ] && echo "Directory Exists" || mkdir $BUILD_BRANCH
-                        chmod 777 $BUILD_BRANCH
-                        cd $BUILD_BRANCH/
+                        [ -d $BRANCH_NAME ] && echo "Directory Exists" || mkdir $BRANCH_NAME
+                        chmod 777 $BRANCH_NAME
+                        cd $BRANCH_NAME/
                         rm -rf *
                     '''
                 }

From cde2947ce566685258563619611ffc8979a208f3 Mon Sep 17 00:00:00 2001
From: Srinivas Uppoju <su671781@broadcom.net>
Date: Mon, 25 Oct 2021 10:14:00 +0100
Subject: [PATCH 06/27] Migrate mas sdk release build

---
 Jenkinsfile-Release | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile-Release b/Jenkinsfile-Release
index af3ce1eb..69f54e48 100644
--- a/Jenkinsfile-Release
+++ b/Jenkinsfile-Release
@@ -44,10 +44,10 @@ pipeline {
                         ./gradlew build
 
                         # Copy binaries to local folder MobileSDK
-                        cp mas-foundation/build/outputs/aar/mas-foundation-release.aar ../../$ZIP_NAME/mas-foundation-${params.sdk_version}-$BUILD_NUMBER.aar
-                        cp mas-connecta/build/outputs/aar/mas-connecta-release.aar ../../$ZIP_NAME/mas-connecta-${params.sdk_version}-$BUILD_NUMBER.aar
-                        cp mas-storage/build/outputs/aar/mas-storage-release.aar ../../$ZIP_NAME/mas-storage-${params.sdk_version}-$BUILD_NUMBER.aar
-                        cp masui/build/outputs/aar/masui-release.aar ../../$ZIP_NAME/masui-${params.sdk_version}-$BUILD_NUMBER.aar
+                        cp mas-foundation/build/outputs/aar/mas-foundation-release.aar ../../${ZIP_NAME}/mas-foundation-${params.sdk_version}-${BUILD_NUMBER}.aar
+                        cp mas-connecta/build/outputs/aar/mas-connecta-release.aar ../../${ZIP_NAME}/mas-connecta-${params.sdk_version}-${BUILD_NUMBER}.aar
+                        cp mas-storage/build/outputs/aar/mas-storage-release.aar ../../${ZIP_NAME}/mas-storage-${params.sdk_version}-${BUILD_NUMBER}.aar
+                        cp masui/build/outputs/aar/masui-release.aar ../../${ZIP_NAME}/masui-${params.sdk_version}-${BUILD_NUMBER}.aar
 
                         # Zip and Copy javadoc to folder MobileSDK
                         cd docs
@@ -55,7 +55,7 @@ pipeline {
                         zip -r mas_storage_javadoc.zip mas_storage_javadoc/
                         zip -r mas_connecta_javadoc.zip mas_connecta_javadoc/
 
-                        sudo cp *.zip ../../../$ZIP_NAME/
+                        sudo cp *.zip ../../../${ZIP_NAME}/
                     '''
                 }
             }

From 7fdcdebfc2b2db6afbee31860949983c83e7494a Mon Sep 17 00:00:00 2001
From: Srinivas Uppoju <su671781@broadcom.net>
Date: Mon, 25 Oct 2021 10:24:00 +0100
Subject: [PATCH 07/27] Migrate mas sdk release build

---
 Jenkinsfile-Release | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile-Release b/Jenkinsfile-Release
index 69f54e48..0b4578d3 100644
--- a/Jenkinsfile-Release
+++ b/Jenkinsfile-Release
@@ -39,15 +39,19 @@ pipeline {
             steps {
                 script {
                     sh '''#!/bin/bash
+                        cd $WORK_SPACE
+                        zip_name=$ZIP_NAME
+                        build_number=$BUILD_NUMBER
+                        sdk_version=${params.sdk_version}
                         cat /dev/null > settings.gradle
                         printf "include ':mas', ':masui', ':mas-connecta', ':mas-storage',  ':mas-foundation', ':mas-test'" > settings.gradle
                         ./gradlew build
 
                         # Copy binaries to local folder MobileSDK
-                        cp mas-foundation/build/outputs/aar/mas-foundation-release.aar ../../${ZIP_NAME}/mas-foundation-${params.sdk_version}-${BUILD_NUMBER}.aar
-                        cp mas-connecta/build/outputs/aar/mas-connecta-release.aar ../../${ZIP_NAME}/mas-connecta-${params.sdk_version}-${BUILD_NUMBER}.aar
-                        cp mas-storage/build/outputs/aar/mas-storage-release.aar ../../${ZIP_NAME}/mas-storage-${params.sdk_version}-${BUILD_NUMBER}.aar
-                        cp masui/build/outputs/aar/masui-release.aar ../../${ZIP_NAME}/masui-${params.sdk_version}-${BUILD_NUMBER}.aar
+                        cp mas-foundation/build/outputs/aar/mas-foundation-release.aar ../../${zip_name}/mas-foundation-${sdk_version}-${build_number}.aar
+                        cp mas-connecta/build/outputs/aar/mas-connecta-release.aar ../../${zip_name}/mas-connecta-${sdk_version}-${build_number}.aar
+                        cp mas-storage/build/outputs/aar/mas-storage-release.aar ../../${zip_name}/mas-storage-${sdk_version}-${build_number}.aar
+                        cp masui/build/outputs/aar/masui-release.aar ../../${zip_name}/masui-${sdk_version}-${build_number}.aar
 
                         # Zip and Copy javadoc to folder MobileSDK
                         cd docs
@@ -55,7 +59,7 @@ pipeline {
                         zip -r mas_storage_javadoc.zip mas_storage_javadoc/
                         zip -r mas_connecta_javadoc.zip mas_connecta_javadoc/
 
-                        sudo cp *.zip ../../../${ZIP_NAME}/
+                        sudo cp *.zip ../../../${zip_name}/
                     '''
                 }
             }

From 9686e02d5197c12e190d9ed11ba45b9ee16d6540 Mon Sep 17 00:00:00 2001
From: Srinivas Uppoju <su671781@broadcom.net>
Date: Mon, 25 Oct 2021 10:28:49 +0100
Subject: [PATCH 08/27] Migrate mas sdk release build

---
 Jenkinsfile-Release | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile-Release b/Jenkinsfile-Release
index 0b4578d3..6e30c6bc 100644
--- a/Jenkinsfile-Release
+++ b/Jenkinsfile-Release
@@ -38,11 +38,14 @@ pipeline {
         stage('Build Android SDK - Gradle and copy to MobileSDK folder') {
             steps {
                 script {
+                    sdk_version=${params.sdk_version}
                     sh '''#!/bin/bash
                         cd $WORK_SPACE
                         zip_name=$ZIP_NAME
+                        echo %zip_name%
                         build_number=$BUILD_NUMBER
-                        sdk_version=${params.sdk_version}
+                        echo %build_number%
+                        echo ${sdk_version}
                         cat /dev/null > settings.gradle
                         printf "include ':mas', ':masui', ':mas-connecta', ':mas-storage',  ':mas-foundation', ':mas-test'" > settings.gradle
                         ./gradlew build

From 8bd133b0e856a636be654539415e81c7922a2b42 Mon Sep 17 00:00:00 2001
From: Srinivas Uppoju <su671781@broadcom.net>
Date: Mon, 25 Oct 2021 10:34:52 +0100
Subject: [PATCH 09/27] Migrate mas sdk release build

---
 Jenkinsfile-Release | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile-Release b/Jenkinsfile-Release
index 6e30c6bc..95fd4333 100644
--- a/Jenkinsfile-Release
+++ b/Jenkinsfile-Release
@@ -38,7 +38,7 @@ pipeline {
         stage('Build Android SDK - Gradle and copy to MobileSDK folder') {
             steps {
                 script {
-                    sdk_version=${params.sdk_version}
+                    def sdk_version=${params.sdk_version}
                     sh '''#!/bin/bash
                         cd $WORK_SPACE
                         zip_name=$ZIP_NAME

From 6e49ceee3b06b90488997ed99fad8b06a02a8ea2 Mon Sep 17 00:00:00 2001
From: Srinivas Uppoju <su671781@broadcom.net>
Date: Mon, 25 Oct 2021 10:36:08 +0100
Subject: [PATCH 10/27] Migrate mas sdk release build

---
 Jenkinsfile-Release | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile-Release b/Jenkinsfile-Release
index 95fd4333..954c078f 100644
--- a/Jenkinsfile-Release
+++ b/Jenkinsfile-Release
@@ -38,7 +38,7 @@ pipeline {
         stage('Build Android SDK - Gradle and copy to MobileSDK folder') {
             steps {
                 script {
-                    def sdk_version=${params.sdk_version}
+                    echo ${params.sdk_version}
                     sh '''#!/bin/bash
                         cd $WORK_SPACE
                         zip_name=$ZIP_NAME

From 1a7352e45b7e399d728ac54f6d9491edfb8a0acb Mon Sep 17 00:00:00 2001
From: Srinivas Uppoju <su671781@broadcom.net>
Date: Mon, 25 Oct 2021 10:37:32 +0100
Subject: [PATCH 11/27] Migrate mas sdk release build

---
 Jenkinsfile-Release | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Jenkinsfile-Release b/Jenkinsfile-Release
index 954c078f..ef2d5a5f 100644
--- a/Jenkinsfile-Release
+++ b/Jenkinsfile-Release
@@ -38,7 +38,6 @@ pipeline {
         stage('Build Android SDK - Gradle and copy to MobileSDK folder') {
             steps {
                 script {
-                    echo ${params.sdk_version}
                     sh '''#!/bin/bash
                         cd $WORK_SPACE
                         zip_name=$ZIP_NAME

From 362d33518e0eecad80faa67bf722e6a6c2c973d5 Mon Sep 17 00:00:00 2001
From: Srinivas Uppoju <su671781@broadcom.net>
Date: Mon, 25 Oct 2021 10:40:56 +0100
Subject: [PATCH 12/27] Migrate mas sdk release build

---
 Jenkinsfile-Release | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile-Release b/Jenkinsfile-Release
index ef2d5a5f..8c2d879e 100644
--- a/Jenkinsfile-Release
+++ b/Jenkinsfile-Release
@@ -40,10 +40,11 @@ pipeline {
                 script {
                     sh '''#!/bin/bash
                         cd $WORK_SPACE
+                        echo ${WORK_SPACE}
                         zip_name=$ZIP_NAME
-                        echo %zip_name%
+                        echo ${zip_name}
                         build_number=$BUILD_NUMBER
-                        echo %build_number%
+                        echo ${build_number}
                         echo ${sdk_version}
                         cat /dev/null > settings.gradle
                         printf "include ':mas', ':masui', ':mas-connecta', ':mas-storage',  ':mas-foundation', ':mas-test'" > settings.gradle

From 92f53e7a7afecad3e07993138afb241d4873bb43 Mon Sep 17 00:00:00 2001
From: Srinivas Uppoju <su671781@broadcom.net>
Date: Mon, 25 Oct 2021 10:43:19 +0100
Subject: [PATCH 13/27] Migrate mas sdk release build

---
 Jenkinsfile-Release | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Jenkinsfile-Release b/Jenkinsfile-Release
index 8c2d879e..eb323a20 100644
--- a/Jenkinsfile-Release
+++ b/Jenkinsfile-Release
@@ -39,13 +39,9 @@ pipeline {
             steps {
                 script {
                     sh '''#!/bin/bash
-                        cd $WORK_SPACE
-                        echo ${WORK_SPACE}
+                        cd $WORKSPACE
                         zip_name=$ZIP_NAME
-                        echo ${zip_name}
                         build_number=$BUILD_NUMBER
-                        echo ${build_number}
-                        echo ${sdk_version}
                         cat /dev/null > settings.gradle
                         printf "include ':mas', ':masui', ':mas-connecta', ':mas-storage',  ':mas-foundation', ':mas-test'" > settings.gradle
                         ./gradlew build

From aa9ff3faa06c7a553f795a21646042fce72ac841 Mon Sep 17 00:00:00 2001
From: Srinivas Uppoju <su671781@broadcom.net>
Date: Mon, 25 Oct 2021 10:45:46 +0100
Subject: [PATCH 14/27] Migrate mas sdk release build

---
 Jenkinsfile-Release | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Jenkinsfile-Release b/Jenkinsfile-Release
index eb323a20..46ae2d70 100644
--- a/Jenkinsfile-Release
+++ b/Jenkinsfile-Release
@@ -39,7 +39,9 @@ pipeline {
             steps {
                 script {
                     sh '''#!/bin/bash
+                        pwd
                         cd $WORKSPACE
+                        pwd
                         zip_name=$ZIP_NAME
                         build_number=$BUILD_NUMBER
                         cat /dev/null > settings.gradle

From 6cfa17b1f93425b46c71f17138271eb001249598 Mon Sep 17 00:00:00 2001
From: Srinivas Uppoju <su671781@broadcom.net>
Date: Mon, 25 Oct 2021 10:49:38 +0100
Subject: [PATCH 15/27] Migrate mas sdk release build

---
 Jenkinsfile-Release | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Jenkinsfile-Release b/Jenkinsfile-Release
index 46ae2d70..163e6a47 100644
--- a/Jenkinsfile-Release
+++ b/Jenkinsfile-Release
@@ -39,9 +39,7 @@ pipeline {
             steps {
                 script {
                     sh '''#!/bin/bash
-                        pwd
-                        cd $WORKSPACE
-                        pwd
+                        ls
                         zip_name=$ZIP_NAME
                         build_number=$BUILD_NUMBER
                         cat /dev/null > settings.gradle

From 630044ec1dd4811ad15cbfcb095e169b619c5bcc Mon Sep 17 00:00:00 2001
From: Srinivas Uppoju <su671781@broadcom.net>
Date: Mon, 25 Oct 2021 10:55:26 +0100
Subject: [PATCH 16/27] Migrate mas sdk release build

---
 Jenkinsfile-Release | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Jenkinsfile-Release b/Jenkinsfile-Release
index 163e6a47..4749ae5c 100644
--- a/Jenkinsfile-Release
+++ b/Jenkinsfile-Release
@@ -21,6 +21,7 @@ pipeline {
                 script {
                     sh '''#!/bin/bash
                         #Delete and Re-create local SDK folder
+                        ls -ll
                         rm -rf $ZIP_NAME
                         sudo mkdir $ZIP_NAME
 

From e55507981a4410d79140dc93981a3eee91b4a523 Mon Sep 17 00:00:00 2001
From: Srinivas Uppoju <su671781@broadcom.net>
Date: Mon, 25 Oct 2021 11:22:14 +0100
Subject: [PATCH 17/27] Migrate mas sdk release build

---
 Jenkinsfile-Release | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile-Release b/Jenkinsfile-Release
index 4749ae5c..66e80c70 100644
--- a/Jenkinsfile-Release
+++ b/Jenkinsfile-Release
@@ -21,7 +21,6 @@ pipeline {
                 script {
                     sh '''#!/bin/bash
                         #Delete and Re-create local SDK folder
-                        ls -ll
                         rm -rf $ZIP_NAME
                         sudo mkdir $ZIP_NAME
 
@@ -30,8 +29,12 @@ pipeline {
                         cd ../../../../../../Volumes/wip/mag/MobileSDK-Hotfix-Binaries/
                         [ -d $BRANCH_NAME ] && echo "Directory Exists" || mkdir $BRANCH_NAME
                         chmod 777 $BRANCH_NAME
-                        cd $BRANCH_NAME/
-                        rm -rf *
+                        if [ -d $BRANCH_NAME ]
+                        then
+                           cd $BRANCH_NAME/
+                           rm -rf *
+                        fi
+
                     '''
                 }
             }
@@ -40,7 +43,6 @@ pipeline {
             steps {
                 script {
                     sh '''#!/bin/bash
-                        ls
                         zip_name=$ZIP_NAME
                         build_number=$BUILD_NUMBER
                         cat /dev/null > settings.gradle

From dddf7263efedb822ee783f571a443beb50114219 Mon Sep 17 00:00:00 2001
From: chinnikrishna-private
 <68179767+chinnikrishna-private@users.noreply.github.com>
Date: Tue, 4 Jan 2022 13:37:51 +0530
Subject: [PATCH 18/27] Updated ANDROID_HOME path

Updated ANDROID_HOME path
---
 Jenkinsfile-Release | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile-Release b/Jenkinsfile-Release
index 66e80c70..9ac543e5 100644
--- a/Jenkinsfile-Release
+++ b/Jenkinsfile-Release
@@ -6,7 +6,7 @@ pipeline {
             string(name: 'sdk_version', defaultValue: '2.1.00', description: 'Android SDK Version')
     }
     environment {
-        ANDROID_HOME ='/Users/qa/Library/Android/sdk'
+        ANDROID_HOME ='/Users/MacMiniAdmin/Library/Android/sdk'
         BUILD_PATH = '/Users/qa/Documents/iOSRepos/buildScript'
         BUILD_HOST = 'localhost'
         BUILD_USER = 'qa'
@@ -67,4 +67,4 @@ pipeline {
             }
         }
     }
-}
\ No newline at end of file
+}

From 556da767280399f18b7dc676b2e5baafbbde189c Mon Sep 17 00:00:00 2001
From: chinnikrishna-private
 <68179767+chinnikrishna-private@users.noreply.github.com>
Date: Tue, 4 Jan 2022 14:13:17 +0530
Subject: [PATCH 19/27] Updated Agent Name

Updated Agent Name
---
 Jenkinsfile-Release | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile-Release b/Jenkinsfile-Release
index 9ac543e5..04132696 100644
--- a/Jenkinsfile-Release
+++ b/Jenkinsfile-Release
@@ -1,7 +1,7 @@
 @Library('apim-jenkins-lib@master') _
 
 pipeline {
-    agent { label 'ng2AgentStable' }
+    agent { label 'apim-macmini-colo-01.lvn.broadcom.net' }
     parameters {
             string(name: 'sdk_version', defaultValue: '2.1.00', description: 'Android SDK Version')
     }

From e91c00398decb3fe56a2005247afaf01d0c86e12 Mon Sep 17 00:00:00 2001
From: chinnikrishna-private
 <68179767+chinnikrishna-private@users.noreply.github.com>
Date: Tue, 4 Jan 2022 14:39:58 +0530
Subject: [PATCH 20/27] Updated BUILD_PATH

Updated BUILD_PATH
---
 Jenkinsfile-Release | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile-Release b/Jenkinsfile-Release
index 04132696..1ab271cf 100644
--- a/Jenkinsfile-Release
+++ b/Jenkinsfile-Release
@@ -7,7 +7,7 @@ pipeline {
     }
     environment {
         ANDROID_HOME ='/Users/MacMiniAdmin/Library/Android/sdk'
-        BUILD_PATH = '/Users/qa/Documents/iOSRepos/buildScript'
+        BUILD_PATH = '/Users/MacMiniAdmin/Documents/iOSRepos/buildScript'
         BUILD_HOST = 'localhost'
         BUILD_USER = 'qa'
         BUILD_PASSWORD = '7layer'

From a8ee4dffc10463cc59adb87d42a5fcb5921384b3 Mon Sep 17 00:00:00 2001
From: chinnikrishna-private
 <68179767+chinnikrishna-private@users.noreply.github.com>
Date: Tue, 4 Jan 2022 14:58:02 +0530
Subject: [PATCH 21/27] Updated Java Home

Updated Java Home
---
 Jenkinsfile-Release | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile-Release b/Jenkinsfile-Release
index 1ab271cf..fba35d93 100644
--- a/Jenkinsfile-Release
+++ b/Jenkinsfile-Release
@@ -13,7 +13,7 @@ pipeline {
         BUILD_PASSWORD = '7layer'
         MODULE = 'all'
         ZIP_NAME = 'MobileSDK'
-        JAVA_HOME = '/usr/java/jdk1.8.0_275'
+        JAVA_HOME = '/Library/Java/JavaVirtualMachines/temurin-8.jdk/Contents/Home'
     }
     stages {
         stage('Clean Filer3 Folder and the local folder') {

From 8e1b388dcc85a8254a6764610649c8109a0bdedf Mon Sep 17 00:00:00 2001
From: chinnikrishna-private
 <68179767+chinnikrishna-private@users.noreply.github.com>
Date: Tue, 4 Jan 2022 15:23:53 +0530
Subject: [PATCH 22/27] Updated Java Home

Updated Java Home
---
 Jenkinsfile-Release | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile-Release b/Jenkinsfile-Release
index fba35d93..212bff7d 100644
--- a/Jenkinsfile-Release
+++ b/Jenkinsfile-Release
@@ -13,7 +13,7 @@ pipeline {
         BUILD_PASSWORD = '7layer'
         MODULE = 'all'
         ZIP_NAME = 'MobileSDK'
-        JAVA_HOME = '/Library/Java/JavaVirtualMachines/temurin-8.jdk/Contents/Home'
+        JAVA_HOME = '/Library/Java/JavaVirtualMachines/jdk1.8.0_281.jdk/Contents/Home'
     }
     stages {
         stage('Clean Filer3 Folder and the local folder') {

From 5dcfe60bf91db6c14057e443bd47ebbfbd2b523e Mon Sep 17 00:00:00 2001
From: chinnikrishna-private
 <68179767+chinnikrishna-private@users.noreply.github.com>
Date: Tue, 4 Jan 2022 16:16:01 +0530
Subject: [PATCH 23/27] Removed ../../ to debug copy error

Removed ../../ to debug copy error
---
 Jenkinsfile-Release | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile-Release b/Jenkinsfile-Release
index 212bff7d..94c65c49 100644
--- a/Jenkinsfile-Release
+++ b/Jenkinsfile-Release
@@ -50,10 +50,10 @@ pipeline {
                         ./gradlew build
 
                         # Copy binaries to local folder MobileSDK
-                        cp mas-foundation/build/outputs/aar/mas-foundation-release.aar ../../${zip_name}/mas-foundation-${sdk_version}-${build_number}.aar
-                        cp mas-connecta/build/outputs/aar/mas-connecta-release.aar ../../${zip_name}/mas-connecta-${sdk_version}-${build_number}.aar
-                        cp mas-storage/build/outputs/aar/mas-storage-release.aar ../../${zip_name}/mas-storage-${sdk_version}-${build_number}.aar
-                        cp masui/build/outputs/aar/masui-release.aar ../../${zip_name}/masui-${sdk_version}-${build_number}.aar
+                        cp mas-foundation/build/outputs/aar/mas-foundation-release.aar ${zip_name}/mas-foundation-${sdk_version}-${build_number}.aar
+                        cp mas-connecta/build/outputs/aar/mas-connecta-release.aar ${zip_name}/mas-connecta-${sdk_version}-${build_number}.aar
+                        cp mas-storage/build/outputs/aar/mas-storage-release.aar ${zip_name}/mas-storage-${sdk_version}-${build_number}.aar
+                        cp masui/build/outputs/aar/masui-release.aar ${zip_name}/masui-${sdk_version}-${build_number}.aar
 
                         # Zip and Copy javadoc to folder MobileSDK
                         cd docs

From f585fef6da9e5324a8be5384bbf22f88efc80f1d Mon Sep 17 00:00:00 2001
From: chinnikrishna-private
 <68179767+chinnikrishna-private@users.noreply.github.com>
Date: Tue, 4 Jan 2022 18:17:34 +0530
Subject: [PATCH 24/27] Updated ANDROID_HOME, JAVA_HOME and Agent Name

Updated ANDROID_HOME, JAVA_HOME and Agent Name
---
 Jenkinsfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index db56ac5d..02decc8a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,12 +1,12 @@
 @Library('apim-jenkins-lib@master') _
 
 pipeline {
-    agent { label 'ng2AgentStable' }
+    agent { label 'apim-macmini-colo-01.lvn.broadcom.net' }
     environment {
-        ANDROID_HOME ='/Users/qa/Library/Android/sdk'
+        ANDROID_HOME ='/Users/MacMiniAdmin/Library/Android/sdk'
         ADB = '${ANDROID_HOME}/platform-tools/adb'
         GATEWAY_VERSION = 'latest'
-        JAVA_HOME = '/usr/java/jdk1.8.0_275'
+        JAVA_HOME = '/Library/Java/JavaVirtualMachines/jdk1.8.0_281.jdk/Contents/Home'
     }
     stages {
         stage('Build') {
@@ -17,4 +17,4 @@ pipeline {
             }
         }
     }
-}
\ No newline at end of file
+}

From 0c74d3f64cb283284f9c8aa00c4cb1d35a600bcf Mon Sep 17 00:00:00 2001
From: chinnikrishna-private
 <68179767+chinnikrishna-private@users.noreply.github.com>
Date: Wed, 5 Jan 2022 11:57:41 +0530
Subject: [PATCH 25/27] Updated folder permission as copy Permission denied

Updated folder permission as copy Permission denied
---
 Jenkinsfile-Release | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile-Release b/Jenkinsfile-Release
index 94c65c49..6b70259d 100644
--- a/Jenkinsfile-Release
+++ b/Jenkinsfile-Release
@@ -28,7 +28,7 @@ pipeline {
                         chmod 777 ../../../../../../Volumes/wip/mag/MobileSDK-Hotfix-Binaries/
                         cd ../../../../../../Volumes/wip/mag/MobileSDK-Hotfix-Binaries/
                         [ -d $BRANCH_NAME ] && echo "Directory Exists" || mkdir $BRANCH_NAME
-                        chmod 777 $BRANCH_NAME
+                        chmod +x $BRANCH_NAME
                         if [ -d $BRANCH_NAME ]
                         then
                            cd $BRANCH_NAME/

From efe5a008accc2cc2cfc7977ed2c285a1ff031905 Mon Sep 17 00:00:00 2001
From: chinnikrishna-private
 <68179767+chinnikrishna-private@users.noreply.github.com>
Date: Wed, 5 Jan 2022 12:06:36 +0530
Subject: [PATCH 26/27] Updated Permission for MobileSDK folder, as copying not
 allowed during build

Updated Permission for MobileSDK folder, as copying not allowed during build
---
 Jenkinsfile-Release | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Jenkinsfile-Release b/Jenkinsfile-Release
index 6b70259d..274a1470 100644
--- a/Jenkinsfile-Release
+++ b/Jenkinsfile-Release
@@ -23,6 +23,7 @@ pipeline {
                         #Delete and Re-create local SDK folder
                         rm -rf $ZIP_NAME
                         sudo mkdir $ZIP_NAME
+                        chmod +x  $ZIP_NAME
 
                         #Clear MobileSDK-Hotfix-Binaries folder on filer3
                         chmod 777 ../../../../../../Volumes/wip/mag/MobileSDK-Hotfix-Binaries/

From c52839e7bfabe787b98d9dc822d6e1daef347858 Mon Sep 17 00:00:00 2001
From: chinnikrishna-private
 <68179767+chinnikrishna-private@users.noreply.github.com>
Date: Wed, 5 Jan 2022 12:22:06 +0530
Subject: [PATCH 27/27] Updated folder permissions

Updated folder permissions
---
 Jenkinsfile-Release | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile-Release b/Jenkinsfile-Release
index 274a1470..743e9a71 100644
--- a/Jenkinsfile-Release
+++ b/Jenkinsfile-Release
@@ -23,13 +23,13 @@ pipeline {
                         #Delete and Re-create local SDK folder
                         rm -rf $ZIP_NAME
                         sudo mkdir $ZIP_NAME
-                        chmod +x  $ZIP_NAME
+                        chmod -R 777 $ZIP_NAME
 
                         #Clear MobileSDK-Hotfix-Binaries folder on filer3
                         chmod 777 ../../../../../../Volumes/wip/mag/MobileSDK-Hotfix-Binaries/
                         cd ../../../../../../Volumes/wip/mag/MobileSDK-Hotfix-Binaries/
                         [ -d $BRANCH_NAME ] && echo "Directory Exists" || mkdir $BRANCH_NAME
-                        chmod +x $BRANCH_NAME
+                        chmod 777 $BRANCH_NAME
                         if [ -d $BRANCH_NAME ]
                         then
                            cd $BRANCH_NAME/
@@ -45,6 +45,7 @@ pipeline {
                 script {
                     sh '''#!/bin/bash
                         zip_name=$ZIP_NAME
+                        chmod -R 777 ${zip_name}
                         build_number=$BUILD_NUMBER
                         cat /dev/null > settings.gradle
                         printf "include ':mas', ':masui', ':mas-connecta', ':mas-storage',  ':mas-foundation', ':mas-test'" > settings.gradle