Adding custom preparation step for provisioning service

pipelines/basic.yaml

@@ -9,7 +9,7 @@ spec:
     - name: URL
       type: string
       description: URL of the Git repository use for fetching the tasks
-      default: 'https://github.com/RedHatInsights/bonfire-tekton'
+      default: 'https://github.com/RHEnVision/bonfire-tekton'
     - name: REVISION
       type: string
       description: Git commit revision to use for fetching the tasks
@@ -132,6 +132,10 @@ spec:
       type: string
       description: "Tag of the iqe image to run tests from"
       default: ""
+    - name: CUSTOM_PREPARATION_TASK_NAME
+      type: string
+      description: "Custom preparation task to run before running the tests"
+      default: "noop"
   results:
     - name: ARTIFACTS_URL
       description: URL for the test's artifacts
@@ -213,6 +217,27 @@ spec:
             value: "$(params.REVISION)"
           - name: pathInRepo
             value: tasks/deploy.yaml
+    - name: custom-preparation
+      params:
+        - name: NS
+          value: "$(tasks.reserve-namespace.results.NS)"
+        - name: NS_REQUESTER
+          value: "$(context.pipelineRun.name)"
+        - name: EPHEMERAL_ENV_PROVIDER_SECRET
+          value: "$(params.EPHEMERAL_ENV_PROVIDER_SECRET)"
+        - name: BONFIRE_IMAGE
+          value: "$(params.BONFIRE_IMAGE)"
+      taskRef:
+        resolver: git
+        params:
+          - name: url
+            value: "$(params.URL)"
+          - name: revision
+            value: "$(params.REVISION)"
+          - name: pathInRepo
+            value: tasks/$(params.CUSTOM_PREPARATION_TASK_NAME).yaml
+      runAfter:
+        - deploy-application
     - name: run-iqe-cji
       params:
         - name: BONFIRE_IMAGE
@@ -245,6 +270,8 @@ spec:
           value: "$(params.IQE_ENV)"
         - name: IQE_ENV_VARS
           value: "$(params.IQE_ENV_VARS)"
+        - name: IQE_ENV_VARS_SUBSTITUTE
+          value: "$(tasks.custom-preparation.results.iqe-additional-env-vars)"
         - name: IQE_SELENIUM
           value: "$(params.IQE_SELENIUM)"
         - name: IQE_PARALLEL_ENABLED
@@ -259,6 +286,7 @@ spec:
           value: "$(params.IQE_IMAGE_TAG)"
       runAfter:
         - deploy-application
+        - custom-preparation
       taskRef:
         resolver: git
         params:
@@ -267,4 +295,4 @@ spec:
           - name: revision
             value: "$(params.REVISION)"
           - name: pathInRepo
-            value: tasks/run-iqe-cji.yaml
+            value: tasks/run-iqe-cji.yaml

pipelines/basic_no_iqe.yaml

@@ -9,7 +9,7 @@ spec:
     - name: URL
       type: string
       description: URL of the Git repository use for fetching the tasks
-      default: 'https://github.com/RedHatInsights/bonfire-tekton'
+      default: 'https://github.com/RHEnVision/bonfire-tekton'
     - name: REVISION
       type: string
       description: Git commit revision to use for fetching the tasks
@@ -154,3 +154,4 @@ spec:
             value: "$(params.REVISION)"
           - name: pathInRepo
             value: tasks/deploy.yaml
+

tasks/deploy.yaml

@@ -115,4 +115,4 @@ spec:
           EXTRA_DEPLOY_ARGS+=" $(parse-snapshot.py) "
         fi
         export EXTRA_DEPLOY_ARGS
-        deploy.sh "$(params.NS)" "$(params.NS_REQUESTER)" 
+        deploy.sh "$(params.NS)" "$(params.NS_REQUESTER)" 

tasks/noop.yaml

@@ -0,0 +1,16 @@
+apiVersion: tekton.dev/v1beta1
+kind: Task
+metadata:
+  name: noop
+spec:
+  results:
+    - name: iqe-additional-env-vars
+      description: ""
+  steps:
+    - name: noop-preparation
+      image: ubuntu
+      script: |
+        #!/bin/bash
+        echo "Noop - skipping - no preparation needed"
+
+        echo -n "" > $(results.iqe-additional-env-vars.path)

tasks/preparation-provisioning.yaml

@@ -0,0 +1,104 @@
+apiVersion: tekton.dev/v1beta1
+kind: Task
+metadata:
+  name: preparation-provisioning
+spec:
+  params:
+    - name : BONFIRE_IMAGE
+      type: string
+      description: The container Bonfire image to use for the tekton tasks
+      default: quay.io/redhat-services-prod/hcm-eng-prod-tenant/cicd-tools:bb80105
+    - name: CUSTOM_IMAGE
+      type: string
+      description: The container image to use for the provisioning setup task
+      default: quay.io/envision/provisioning-cicd:latest
+    - name: NS
+      type: string
+      description: Namespace name to deploy the application to
+    - name: NS_REQUESTER
+      type: string
+      description: The name of the person/pipeline that requested the namespace
+    - name: EPHEMERAL_ENV_PROVIDER_SECRET
+      type: string
+      default: ephemeral-env-provider
+      description: "Secret for connecting to ephemeral env provider cluster"
+    - name: AWS_ACCOUNT_ID_SECRET
+      type: string
+      description: Secret containing the AWS Account ID
+      default: provisioning-aws-account-id
+    - name: AZURE_TENANT_ID_SECRET
+      type: string
+      description: Secret containing the AZURE Tenant ID
+      default: provisioning-azure-secrets
+    - name: AZURE_SUBSCRIPTION_ID_SECRET
+      type: string
+      description: Secret containing the AZURE Subscription ID
+      default: provisioning-azure-secrets
+    - name: AZURE_RESOURCE_GROUP_SECRET
+      type: string
+      description: Secret containing the AZURE Resource Group
+      default: provisioning-azure-secrets
+  results:
+    - name: iqe-additional-env-vars
+      description: ""
+  steps:
+    - name: provisioning-setup
+      image: "$(params.CUSTOM_IMAGE)"
+      env:
+        - name: OC_LOGIN_TOKEN
+          valueFrom:
+            secretKeyRef:
+              name: $(params.EPHEMERAL_ENV_PROVIDER_SECRET)
+              key: token
+        - name: OC_LOGIN_SERVER
+          valueFrom:
+            secretKeyRef:
+              name: $(params.EPHEMERAL_ENV_PROVIDER_SECRET)
+              key: url
+        - name: AWS_ACCOUNT_ID
+          valueFrom:
+            secretKeyRef:
+              name: $(params.AWS_ACCOUNT_ID_SECRET)
+              key: AWS_ACCOUNT_ID
+        - name: AZURE_TENANT_ID
+          valueFrom:
+            secretKeyRef:
+              name: $(params.AZURE_TENANT_ID_SECRET)
+              key: AZURE_TENANT_ID
+        - name: AZURE_SUBSCRIPTION_ID
+          valueFrom:
+            secretKeyRef:
+              name: $(params.AZURE_SUBSCRIPTION_ID_SECRET)
+              key: AZURE_SUBSCRIPTION_ID
+        - name: AZURE_RESOURCE_GROUP
+          valueFrom:
+            secretKeyRef:
+              name: $(params.AZURE_RESOURCE_GROUP_SECRET)
+              key: AZURE_RESOURCE_GROUP       
+        - name: BONFIRE_BOT
+          value: "true"
+      script: |
+        #!/bin/bash
+        set -ex
+
+        echo "Running login.sh script"
+        # running login directly
+        # TODO: switch to using https://github.com/RedHatInsights/cicd-tools/blob/aea5d464a40d9ada1e03f76ff85cb6c5d0deb7e2/konflux_scripts/login.sh
+
+        echo "Login to ephemeral cluster"
+        server="${OC_LOGIN_SERVER:?OC_LOGIN_SERVER env var was not defined}"
+        token="${OC_LOGIN_TOKEN:?OC_LOGIN_SERVER env var was not defined}"
+
+        oc login --token="$token" --server="$server"
+
+        oc project "$(params.NS)"
+
+        export AWS_ACCOUNT_ID
+        export AZURE_TENANT_ID
+        export AZURE_SUBSCRIPTION_ID
+        export AZURE_RESOURCE_GROUP
+
+        source /images_db_stub.sh 
+
+        echo "Storing iqe variables to results"
+        echo -n "$IQE_ENV_VARS" > $(results.iqe-additional-env-vars.path)

tasks/run-iqe-cji.yaml

@@ -59,6 +59,10 @@ spec:
       type: string
       description: "Comma delimited string with additional values, such as IQE_ENV_VARS='DYNACONF_USER_PROVIDER__rbac_enabled=false,foo=bar'"
       default: ""
+    - name: IQE_ENV_VARS_SUBSTITUTE
+      type: string
+      description: "Comma delimited string with additional values used when IQE_ENV_VARS are empty,i.e:IQE_ENV_VARS_SUBSTITUTE='DYNACONF_ephemeral_images__aws__image_uuid=<image_uuid>"
+      default: ""
     - name: IQE_SELENIUM
       type: string
       description: "true -- whether to run IQE pod with a selenium container, default is false"
@@ -119,6 +123,8 @@ spec:
           value: $(params.IQE_ENV)
         - name: IQE_ENV_VARS
           value: $(params.IQE_ENV_VARS)
+        - name: IQE_ENV_VARS_SUBSTITUTE
+          value: $(params.IQE_ENV_VARS_SUBSTITUTE)
         - name: IQE_SELENIUM
           value: $(params.IQE_SELENIUM)
         - name: IQE_PARALLEL_ENABLED
@@ -137,8 +143,13 @@ spec:
         #!/bin/bash
         set -ex
 
+        if [ -z "$IQE_ENV_VARS" ]; then
+          export IQE_ENV_VARS="$IQE_ENV_VARS_SUBSTITUTE"
+        fi
+
         echo "Connecting to the ephemeral namespace cluster"
         login.sh
 
         echo "Deploying the IQE CJI test"
         deploy-iqe-cji.sh "$(params.NS)" "$(params.NS_REQUESTER)"
+        

tasks/teardown.yaml

@@ -112,4 +112,4 @@ spec:
         login.sh
 
         echo "Releasing ephemeral namespace"
-        release-ns.sh "$(params.NS)" "$(params.NS_REQUESTER)"
+        release-ns.sh "$(params.NS)" "$(params.NS_REQUESTER)"