Merge pull request #370 from xinredhat/fix_missing_param

added missing parameter 'auth_config'
redhat-appstudio · Jan 7, 2025 · 639ed2c · 639ed2c
2 parents 0ab90e1 + 8f98cf0
commit 639ed2c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/integration-tests/pict-models/default.pict b/integration-tests/pict-models/default.pict
@@ -2,9 +2,9 @@
 # This is file used for integration tests (PR checks, post-merge checks)
 #
 
-# OCP: 4.17, 4.16
+# OCP: valid OCP versions, for example: 4.17, 4.16
 # ACS: valid values:  new, hosted
-# Registry: valid values:  quay, quay.io, artifactory
+# Registry: valid values:  quay, quay.io, artifactory, nexus
 # TPA: valid values:  new, hosted
 # SCM: valid values:  github, gitlab, bitbucket
 # Pipeline: valid values:  github, gitlab, bitbucket

diff --git a/integration-tests/pipelines/rhtap-cli-e2e.yaml b/integration-tests/pipelines/rhtap-cli-e2e.yaml
@@ -135,6 +135,8 @@ spec:
           value: $(params.scm_config)
         - name: pipeline_config
           value: $(params.pipeline_config)
+        - name: auth_config
+          value: $(params.auth_config)
     - name: sprayproxy-provision
       runAfter:
         - rhtap-install

diff --git a/integration-tests/tasks/rhtap-install.yaml b/integration-tests/tasks/rhtap-install.yaml
@@ -49,6 +49,7 @@ spec:
         set -o errexit
         set -o nounset
         set -o pipefail
+        set -x
 
         GIT_REPO="${GIT_REPO:-$(echo "$JOB_SPEC" | jq -r '.git.repo // empty')}"
 
@@ -57,17 +58,6 @@ spec:
           exit 1
         fi
 
-        # Generate the .env file for rhtap-cli installation based on the configuration given in the pict file
-        if [ -f .env ]; then
-            rm .env
-        fi
-        echo "export acs_config=\"$(params.acs_config)\"" >> .env
-        echo "export tpa_config=\"$(params.tpa_config)\"" >> .env
-        echo "export registry_config=\"$(params.registry_config)\"" >> .env
-        echo "export scm_config=\"$(params.scm_config)\"" >> .env
-        echo "export pipeline_config=\"$(params.pipeline_config)\"" >> .env
-        echo "export auth_config=\"$(params.auth_config)\"" >> .env
-
         # Clone the rhtap-cli repository
         cd "$(mktemp -d)"
 
@@ -83,6 +73,17 @@ spec:
             git clone https://github.com/redhat-appstudio/rhtap-cli.git .
         fi
 
+        # Generate the .env file for rhtap-cli installation based on the configuration given in the pict file
+        if [ -f .env ]; then
+            rm .env
+        fi
+        echo "export acs_config=\"$(params.acs_config)\"" > .env
+        echo "export tpa_config=\"$(params.tpa_config)\"" >> .env
+        echo "export registry_config=\"$(params.registry_config)\"" >> .env
+        echo "export scm_config=\"$(params.scm_config)\"" >> .env
+        echo "export pipeline_config=\"$(params.pipeline_config)\"" >> .env
+        echo "export auth_config=\"$(params.auth_config)\"" >> .env
+
         # Deploy rhtap
         source .env
         ./integration-tests/scripts/ci-oc-login.sh