diff --git a/cypress/jenkins/Jenkinsfile b/cypress/jenkins/Jenkinsfile index f1206e18147..f52de682f63 100644 --- a/cypress/jenkins/Jenkinsfile +++ b/cypress/jenkins/Jenkinsfile @@ -27,7 +27,9 @@ node { string(credentialsId: 'AWS_SECRET_ACCESS_KEY', variable: 'AWS_SECRET_ACCESS_KEY'), string(credentialsId: 'AZURE_AKS_SUBSCRIPTION_ID', variable: 'AZURE_AKS_SUBSCRIPTION_ID'), string(credentialsId: 'AZURE_CLIENT_ID', variable: 'AZURE_CLIENT_ID'), - string(credentialsId: 'AZURE_CLIENT_SECRET', variable: 'AZURE_CLIENT_SECRET')]) { + string(credentialsId: 'AZURE_CLIENT_SECRET', variable: 'AZURE_CLIENT_SECRET'), + string(credentialsId: 'GKE_SERVICE_ACCOUNT', variable: 'GKE_SERVICE_ACCOUNT') + ]) { withEnv(paramsMap) { stage('Checkout') { deleteDir() diff --git a/cypress/jenkins/cypress.config.jenkins.ts b/cypress/jenkins/cypress.config.jenkins.ts index 444b035c69f..7b9455daa91 100644 --- a/cypress/jenkins/cypress.config.jenkins.ts +++ b/cypress/jenkins/cypress.config.jenkins.ts @@ -86,7 +86,8 @@ export default defineConfig({ azureClientId: process.env.AZURE_CLIENT_ID, azureClientSecret: process.env.AZURE_CLIENT_SECRET, customNodeIp: process.env.CUSTOM_NODE_IP, - customNodeKey: process.env.CUSTOM_NODE_KEY + customNodeKey: process.env.CUSTOM_NODE_KEY, + gkeServiceAccount: process.env.GKE_SERVICE_ACCOUNT }, // Jenkins reporters configuration jUnit and HTML reporter: 'cypress-multi-reporters', diff --git a/cypress/jenkins/init.sh b/cypress/jenkins/init.sh index e1d7a223568..317aa3b1c93 100755 --- a/cypress/jenkins/init.sh +++ b/cypress/jenkins/init.sh @@ -93,6 +93,7 @@ corral config vars set azure_subscription_id "${AZURE_AKS_SUBSCRIPTION_ID}" corral config vars set azure_client_id "${AZURE_CLIENT_ID}" corral config vars set azure_client_secret "${AZURE_CLIENT_SECRET}" corral config vars set create_initial_clusters "${CREATE_INITIAL_CLUSTERS}" +corral config vars set gke_service_account "${GKE_SERVICE_ACCOUNT}" create_initial_clusters() { shopt -u nocasematch