From dd4343dc67092c775009d163c74cde65ffd18321 Mon Sep 17 00:00:00 2001 From: jayfranco999 Date: Mon, 28 Oct 2024 12:40:39 +0530 Subject: [PATCH 1/3] chore(jenkinsfile):Add updatecli-aws-credentials Signed-off-by: jayfranco999 --- Jenkinsfile_updatecli | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile_updatecli b/Jenkinsfile_updatecli index 77eda8f36..5b150f9f6 100644 --- a/Jenkinsfile_updatecli +++ b/Jenkinsfile_updatecli @@ -1,4 +1,4 @@ -withCredentials([azureServicePrincipal('updatecli-azure-serviceprincipal')]) { +withCredentials([azureServicePrincipal('updatecli-azure-serviceprincipal'), aws(accessKeyVariable: 'updaecli-aws-access-key-id', secretKeyVariable: 'updatecli-aws-secret-access-key')]) { if (env.BRANCH_IS_PRIMARY) { updatecli(action: 'apply', updatecliAgentLabel: 'linux-amd64-docker', cronTriggerExpression: '@daily') } else { From e2f7e0c163737b3475a176f5d4abd21299f72472 Mon Sep 17 00:00:00 2001 From: jayfranco999 Date: Mon, 28 Oct 2024 16:35:08 +0530 Subject: [PATCH 2/3] fixup Signed-off-by: jayfranco999 --- Jenkinsfile_updatecli | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile_updatecli b/Jenkinsfile_updatecli index 5b150f9f6..ed8c39d7d 100644 --- a/Jenkinsfile_updatecli +++ b/Jenkinsfile_updatecli @@ -1,4 +1,8 @@ -withCredentials([azureServicePrincipal('updatecli-azure-serviceprincipal'), aws(accessKeyVariable: 'updaecli-aws-access-key-id', secretKeyVariable: 'updatecli-aws-secret-access-key')]) { +withCredentials([ + azureServicePrincipal('updatecli-azure-serviceprincipal'), + string(credentialsId: 'updaecli-aws-access-key-id', variable: 'AWS_ACCESS_KEY_ID'), + string(credentialsId: 'updatecli-aws-secret-access-key', variable: 'AWS_SECRET_ACCESS_KEY') +]) { if (env.BRANCH_IS_PRIMARY) { updatecli(action: 'apply', updatecliAgentLabel: 'linux-amd64-docker', cronTriggerExpression: '@daily') } else { From b388132e1784194a1d7873a081bdb56275011323 Mon Sep 17 00:00:00 2001 From: jayfranco999 Date: Mon, 28 Oct 2024 16:35:36 +0530 Subject: [PATCH 3/3] fixup Signed-off-by: jayfranco999 --- Jenkinsfile_updatecli | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile_updatecli b/Jenkinsfile_updatecli index ed8c39d7d..b43f1aff7 100644 --- a/Jenkinsfile_updatecli +++ b/Jenkinsfile_updatecli @@ -1,6 +1,6 @@ withCredentials([ azureServicePrincipal('updatecli-azure-serviceprincipal'), - string(credentialsId: 'updaecli-aws-access-key-id', variable: 'AWS_ACCESS_KEY_ID'), + string(credentialsId: 'updatecli-aws-access-key-id', variable: 'AWS_ACCESS_KEY_ID'), string(credentialsId: 'updatecli-aws-secret-access-key', variable: 'AWS_SECRET_ACCESS_KEY') ]) { if (env.BRANCH_IS_PRIMARY) {