DBZ-5165 added temporary fix for secret name/secret filename non-alignment

jenkins-jobs/docker/debezium-testing-system/deployment-template.sh

@@ -18,13 +18,13 @@ while true; do
         --artifact-server-image ) ARTIFACT_SERVER_IMAGE=$2;   shift 2;;
         --apicurio-version )      APICURIO_VERSION=$2;        shift 2;;
         --groups-arg )            GROUPS_ARG=$2;              shift 2;;
-        --strz-git-repository )   STRZ_GIT_REPOSITORY         shift 2;;
-        --strz-git-branch )       STRZ_GIT_BRANCH             shift 2;;
-        --strz-downstream-url )   STRZ_DOWNSTREAM_URL         shift 2;;
-        --apic-git-repository )   APIC_GIT_REPOSITORY         shift 2;;
-        --apic-git-branch )       APIC_GIT_BRANCH             shift 2;;
-        --apic-downstream-url )   APIC_DOWNSTREAM_URL         shift 2;;
-        -h | --help )             PRINT_HELP=true             shift ;;
+        --strz-git-repository )   STRZ_GIT_REPOSITORY=$2;     shift 2;;
+        --strz-git-branch )       STRZ_GIT_BRANCH=$2;         shift 2;;
+        --strz-downstream-url )   STRZ_DOWNSTREAM_URL=$2;     shift 2;;
+        --apic-git-repository )   APIC_GIT_REPOSITORY=$2;     shift 2;;
+        --apic-git-branch )       APIC_GIT_BRANCH=$2;         shift 2;;
+        --apic-downstream-url )   APIC_DOWNSTREAM_URL=$2;     shift 2;;
+        -h | --help )             PRINT_HELP=true=$2;         shift ;;
         -- ) shift; break ;;
         * ) break ;;
     esac
@@ -92,11 +92,11 @@ spec:
             - name: STRZ_DOWNSTREAM_URL
               value: \"${STRZ_DOWNSTREAM_URL}\"
             - name: APIC_GIT_REPOSITORY
-              value: \"${APIC_GIT_REPOSITORY}}\"
+              value: \"${APIC_GIT_REPOSITORY}\"
             - name: APIC_GIT_BRANCH
-              value: \"${APIC_GIT_BRANCH}}\"
+              value: \"${APIC_GIT_BRANCH}\"
             - name: APIC_DOWNSTREAM_URL
-              value: \"${APIC_DOWNSTREAM_URL}}\"
+              value: \"${APIC_DOWNSTREAM_URL}\"
   triggers:
     - type: \"ConfigChange\"
   paused: false
@@ -105,4 +105,4 @@ spec:
 "
 
 
-printf "%s" "$output" >> "${FILENAME}.yml"
+printf "%s" "${output}" >> "${FILENAME}.yml"

jenkins-jobs/docker/debezium-testing-system/testsuite-deployment.sh

@@ -22,19 +22,13 @@ mvn clean install -DskipTests -DskipITs -f /testsuite/debezium/pom.xml
 ${OCP_PROJECTS} --project "${DBZ_OCP_PROJECT_DEBEZIUM}" --create
 
 # prepare strimzi
-# TODO remove the defaults once it's being ran from jenkins?
-if [ -z "${STRZ_GIT_REPOSITORY}" ]; then
-  STRZ_GIT_REPOSITORY="https://github.com/strimzi/strimzi-kafka-operator.git" ;
-fi
-
-if [ -z "${STRZ_GIT_BRANCH}" ]; then
-  STRZ_GIT_BRANCH="main" ;
-fi
-
 clone_component --component strimzi --git-repository "${STRZ_GIT_REPOSITORY}" --git-branch "${STRZ_GIT_BRANCH}" --product-build "${PRODUCT_BUILD}" --downstream-url "${STRZ_DOWNSTREAM_URL}" ;
 sed -i 's/namespace: .*/namespace: '"${DBZ_OCP_PROJECT_DEBEZIUM}"'/' strimzi/install/cluster-operator/*RoleBinding*.yaml ;
 oc create -f strimzi/install/cluster-operator/ -n "${DBZ_OCP_PROJECT_DEBEZIUM}" ;
 
+echo "~~~~~ strimzi prepared ~~~~~"
+
+
 # prepare apicurio if not disabled
 AVRO_PATTERN='.*!avro.*'
 if [[ ! ${GROUPS_ARG} =~ ${AVRO_PATTERN} ]]; then

jenkins-jobs/job-dsl/ocp_system_test.groovy

@@ -10,6 +10,8 @@ pipelineJob('ocp-system-test') {
         stringParam('DBZ_GIT_BRANCH', 'main', 'A branch/tag of Debezium sources')
 
         stringParam('PULL_SECRET', 'rh-integration-quay-secret', 'Quay.io OpenShift secret')
+        stringParam('PULL_SECRET_NAME', 'rh-integration-debezium-pull-secret', 'Quay.io OpenShift secret name')
+
         stringParam('DOCKER_TAG', 'latest', 'Docker image tag')
         stringParam('OCP_PROJECT_NAME', 'debezium-test', 'OCP projects name')
         stringParam('OCP_CREDENTIALS', 'openshift-dbz-creds', 'Jenkins credentials id')

jenkins-jobs/pipelines/ocp_system_pipeline.groovy

@@ -84,7 +84,7 @@ pipeline {
 
                     cd ${WORKSPACE}/debezium
                     jenkins-jobs/docker/debezium-testing-system/deployment-template.sh --filename "${FILENAME}" \
-                    --pull-secret-name '${PULL_SECRET}' \
+                    --pull-secret-name "${PULL_SECRET_NAME}" \
                     --docker-tag "${DOCKER_TAG}" \
                     --project-name "${OCP_PROJECT_NAME}" \
                     --product-build false \