SUSE · HartS · Jun 18, 2020 · Jun 18, 2020 · Jun 18, 2020
diff --git a/cap-ci/common/destroy_k8s.tmpl b/cap-ci/common/destroy_k8s.tmpl
@@ -1,6 +1,6 @@
 {{ define "common_destroy_k8s" }}
 {{- /* if this is the last enabled job, but not the *only* enabled job (deploy-k8s) */ -}}
-{{- if and (eq .position (sub (len .jobs_enabled) 1)) (ne .position 0) }}
+{{- if and (eq .position (sub (len .jobs_enabled) 1)) (ne .job "deploy-k8s" ) }}
 ensure:
 {{- else }}{{/* if deploy-k8s is the only job, or this job isn't the last job */}}
 on_failure:
@@ -28,6 +28,7 @@ on_failure:
           QUIET_OUTPUT: true
           DOWNLOAD_CATAPULT_DEPS: false
           ENABLE_EIRINI: {{ eq .scheduler "eirini" }}
+          {{ tmpl.Exec "common_eks_params" | indent 10 | trimSpace }}
         run:
           path: "/bin/bash"
           args:

diff --git a/cap-ci/common/eks_params.tmpl b/cap-ci/common/eks_params.tmpl
@@ -0,0 +1,4 @@
+{{ define "common_eks_params" }}
+AWS_ACCESS_KEY_ID: ((aws-ci-chuller-access-key-id))
+AWS_SECRET_ACCESS_KEY: ((aws-ci-chuller-secret-access-key))
+{{ end }}
diff --git a/cap-ci/jobs/cf-acceptance-tests-brain.tmpl b/cap-ci/jobs/cf-acceptance-tests-brain.tmpl
@@ -44,6 +44,7 @@
 {{- print .allbells }}
 {{- end }}
         KUBECF_TEST_SUITE: brain
+        {{ tmpl.Exec "common_eks_params" | indent 8 | trimSpace }}
       run:
         path: "/bin/bash"
         args:

diff --git a/cap-ci/jobs/cf-acceptance-tests.tmpl b/cap-ci/jobs/cf-acceptance-tests.tmpl
@@ -44,6 +44,7 @@
 {{- print .allbells }}
 {{- end }}
         KUBECF_TEST_SUITE: cats
+        {{ tmpl.Exec "common_eks_params" | indent 8 | trimSpace }}
       run:
         path: "/bin/bash"
         args:

diff --git a/cap-ci/jobs/deploy-k8s.tmpl b/cap-ci/jobs/deploy-k8s.tmpl
@@ -33,6 +33,7 @@
         BACKEND: {{ .backend }}
         QUIET_OUTPUT: true
         DOWNLOAD_CATAPULT_DEPS: false
+        {{ tmpl.Exec "common_eks_params" | indent 8 | trimSpace }}
       run:
         path: "/bin/bash"
         args:

diff --git a/cap-ci/jobs/deploy-kubecf.tmpl b/cap-ci/jobs/deploy-kubecf.tmpl
@@ -66,6 +66,7 @@
 {{- if eq .avail "all" }}
 {{- print .allbells }}
 {{- end }}
+        {{ tmpl.Exec "common_eks_params" | indent 8 | trimSpace }}
       run:
         path: "/bin/bash"
         args:

diff --git a/cap-ci/jobs/deploy-stratos.tmpl b/cap-ci/jobs/deploy-stratos.tmpl
@@ -49,6 +49,7 @@
 {{- print .allbells }}
 {{- end }}
         BACKEND: {{ .backend }}
+        {{ tmpl.Exec "common_eks_params" | indent 8 | trimSpace }}
       run:
         path: "/bin/bash"
         args:

diff --git a/cap-ci/jobs/destroy-kubecf.tmpl b/cap-ci/jobs/destroy-kubecf.tmpl
@@ -5,9 +5,11 @@
   plan:
   - get: catapult
   - get: {{ .backend }}-pool.kube-hosts
+    {{- if ne .position 0 }}
     passed:
     - {{ index .jobs_enabled (sub .position 1) }}-{{ .scheduler }}-{{ .backend }}-{{ .avail }}
     trigger: true
+    {{- end }}
   {{- if index .jobs "deploy-k8s" }}
   - get: tfstate-pool
     {{- if ne .position 0 }}
@@ -31,6 +33,7 @@
       params:
         QUIET_OUTPUT: true
         DOWNLOAD_CATAPULT_DEPS: false
+        {{ tmpl.Exec "common_eks_params" | indent 8 | trimSpace }}
       run:
         path: "/bin/bash"
         args:

diff --git a/cap-ci/jobs/smoke-tests.tmpl b/cap-ci/jobs/smoke-tests.tmpl
@@ -44,6 +44,7 @@
 {{- print .allbells }}
 {{- end }}
         KUBECF_TEST_SUITE: smokes
+        {{ tmpl.Exec "common_eks_params" | indent 8 | trimSpace }}
       run:
         path: "/bin/bash"
         args:

diff --git a/cap-ci/jobs/sync-integration-tests.tmpl b/cap-ci/jobs/sync-integration-tests.tmpl
@@ -45,6 +45,7 @@
 {{- print .allbells }}
 {{- end }}
         KUBECF_TEST_SUITE: sits
+        {{ tmpl.Exec "common_eks_params" | indent 8 | trimSpace }}
       run:
         path: "/bin/bash"
         args:

diff --git a/cap-ci/jobs/upgrade-kubecf.tmpl b/cap-ci/jobs/upgrade-kubecf.tmpl
@@ -48,6 +48,7 @@
 {{- print .allbells }}
 {{- end }}
         BACKEND: {{ .backend }}
+        {{ tmpl.Exec "common_eks_params" | indent 8 | trimSpace }}
       run:
         path: "/bin/bash"
         args:

diff --git a/cap-ci/pipeline.yaml.tmpl b/cap-ci/pipeline.yaml.tmpl
@@ -86,7 +86,7 @@ resources:
       url: http://opensource.suse.com/stratos-metrics/
 {{ end }}
 
-{{- if or (index $config.jobs "deploy-k8s") (index $config.jobs "destroy-k8s") }}
+{{- if index $config.jobs "deploy-k8s" }}
 - name: tfstate-pool
   type: pool
   source:
@@ -119,7 +119,7 @@ jobs:
 {{- range $backend, $enabled :=  $config.backends }}{{ if $enabled }}
 {{- range $avail, $enabled := $config.availabilities }}{{ if $enabled }}
 {{- range $scheduler, $enabled := $config.schedulers }}{{ if $enabled }}
-{{- $context := $context | merge (dict "position" $job_index "backend" $backend "avail" $avail "scheduler" $scheduler) -}}
+{{- $context := $context | merge (dict "position" $job_index "backend" $backend "avail" $avail "scheduler" $scheduler "job" $job) -}}
 {{ tmpl.Exec ( print "jobs_" $job ) $context }}
 {{- end }}{{ end }}
 {{- end }}{{ end }}

diff --git a/cap-ci/scripts/deploy_k8s.tmpl b/cap-ci/scripts/deploy_k8s.tmpl
@@ -1,8 +1,6 @@
 {{ define "scripts_deploy_k8s" }}
 {{- /* create k8s cluster */}}
 export random_variable=$(hexdump -n 8 -e '2/4 "%08x"' /dev/urandom)
-export AWS_ACCESS_KEY_ID='((aws-ci-chuller-access-key-id))'
-export AWS_SECRET_ACCESS_KEY='((aws-ci-chuller-secret-access-key))'
 if [[ ${BACKEND} == "gke" ]]; then
   printf "%s" '((gke-key-json))' > $PWD/gke-key.json
   export GKE_CRED_JSON=$PWD/gke-key.json

diff --git a/cap-ci/scripts/import_eks.tmpl b/cap-ci/scripts/import_eks.tmpl
@@ -1,9 +1,6 @@
 {{ define "scripts_import_eks" }}
 {{- /* create buildfolder prepared for eks */}}
 export BACKEND=eks
-{{- /* AWS vars exported here so hijacking doesn't contain them in env */}}
-export AWS_ACCESS_KEY_ID='((aws-ci-chuller-access-key-id))'
-export AWS_SECRET_ACCESS_KEY='((aws-ci-chuller-secret-access-key))'
 export KUBECFG=$PWD/kubeconfig_$CLUSTER_NAME
 make kubeconfig
 {{ end }}