DBZ-5165 fixing the product build in testsuite

This commit is contained in:
Martin Medek 2022-06-21 15:09:41 +02:00 committed by Jakub Cechacek
parent 240700a725
commit 1739ee9cf5
5 changed files with 11 additions and 2 deletions

1
.gitignore vendored
View File

@ -35,3 +35,4 @@ gen/
jenkins-jobs/docker/rhel_kafka/plugins jenkins-jobs/docker/rhel_kafka/plugins
jenkins-jobs/docker/artifact-server/plugins jenkins-jobs/docker/artifact-server/plugins
/jenkins-jobs/docker/debezium-testing-system/secret.yml

View File

@ -41,6 +41,8 @@ spec:
name: \"testsuite\" name: \"testsuite\"
spec: spec:
restartPolicy: Never restartPolicy: Never
imagePullSecrets:
- name: ${PULL_SECRET_NAME}
containers: containers:
- name: \"dbz-testing-system\" - name: \"dbz-testing-system\"
image: \"quay.io/rh_integration/dbz-testing-system:${DOCKER_TAG}\" image: \"quay.io/rh_integration/dbz-testing-system:${DOCKER_TAG}\"

View File

@ -43,14 +43,19 @@ if [[ ! ${GROUPS_ARG} =~ ${AVRO_PATTERN} ]]; then
APICURIO_RESOURCE="install/apicurio-registry-operator-1.1.0-dev.yaml" APICURIO_RESOURCE="install/apicurio-registry-operator-1.1.0-dev.yaml"
fi fi
clone_component --component apicurio --git-repository "${APIC_GIT_REPOSITORY}" --git-branch "${APIC_GIT_BRANCH}" --product-build "${PRODUCT_BUILD}" --downstream-url "${APIC_DOWNSTREAM_URL}" ; clone_component --component apicurio --git-repository "${APIC_GIT_REPOSITORY}" --git-branch "${APIC_GIT_BRANCH}" --product-build "${DBZ_PRODUCT_BUILD}" --downstream-url "${APIC_DOWNSTREAM_URL}" ;
sed -i "s/namespace: apicurio-registry-operator-namespace/namespace: ${DBZ_OCP_PROJECT_REGISTRY}/" apicurio/install/*.yaml ; sed -i "s/namespace: apicurio-registry-operator-namespace/namespace: ${DBZ_OCP_PROJECT_REGISTRY}/" apicurio/install/*.yaml ;
oc create -f apicurio/${APICURIO_RESOURCE} -n "${DBZ_OCP_PROJECT_REGISTRY}" ; oc create -f apicurio/${APICURIO_RESOURCE} -n "${DBZ_OCP_PROJECT_REGISTRY}" ;
fi fi
pushd ${DEBEZIUM_LOCATION} || exit 1; pushd ${DEBEZIUM_LOCATION} || exit 1;
if [ "${DBZ_PRODUCT_BUILD}" == true ] ; then
MVN_PRODUCT_BUILD="-Pproduct"
fi
mvn install -pl debezium-testing/debezium-testing-system -PsystemITs,oracleITs \ mvn install -pl debezium-testing/debezium-testing-system -PsystemITs,oracleITs \
${MVN_PRODUCT_BUILD} \
-Docp.project.debezium="${DBZ_OCP_PROJECT_DEBEZIUM}" \ -Docp.project.debezium="${DBZ_OCP_PROJECT_DEBEZIUM}" \
-Docp.project.db2="${DBZ_OCP_PROJECT_DB2}" \ -Docp.project.db2="${DBZ_OCP_PROJECT_DB2}" \
-Docp.project.mongo="${DBZ_OCP_PROJECT_MONGO}" \ -Docp.project.mongo="${DBZ_OCP_PROJECT_MONGO}" \

View File

@ -20,6 +20,7 @@ pipelineJob('ocp-system-test') {
booleanParam('TEST_APICURIO_REGISTRY', false, 'Run tests with Apicurio Registry and Avro serialization') booleanParam('TEST_APICURIO_REGISTRY', false, 'Run tests with Apicurio Registry and Avro serialization')
booleanParam('STRIMZI_KC_BUILD', false, 'Use connect image instead of artifact server') booleanParam('STRIMZI_KC_BUILD', false, 'Use connect image instead of artifact server')
booleanParam('PRODUCT_BUILD', false, 'Is this a productised build')
stringParam('DBZ_CONNECT_IMAGE', 'quay.io/rh_integration/test-strimzi-kafka:strz-latest-kafka-3.1.0-apc-2.2.3.Final-dbz-2.0.0-SNAPSHOT', 'Debezium connect image') stringParam('DBZ_CONNECT_IMAGE', 'quay.io/rh_integration/test-strimzi-kafka:strz-latest-kafka-3.1.0-apc-2.2.3.Final-dbz-2.0.0-SNAPSHOT', 'Debezium connect image')
stringParam('ARTIFACT_SERVER_IMAGE', 'quay.io/rh_integration/test-artifact-server:2.0.0-SNAPSHOT', 'Artifact server image') stringParam('ARTIFACT_SERVER_IMAGE', 'quay.io/rh_integration/test-artifact-server:2.0.0-SNAPSHOT', 'Artifact server image')
stringParam('APICURIO_VERSION', '2.2.3.Final', 'Apicurio version') stringParam('APICURIO_VERSION', '2.2.3.Final', 'Apicurio version')

View File

@ -87,7 +87,7 @@ pipeline {
--pull-secret-name "${PULL_SECRET_NAME}" \ --pull-secret-name "${PULL_SECRET_NAME}" \
--docker-tag "${DOCKER_TAG}" \ --docker-tag "${DOCKER_TAG}" \
--project-name "${OCP_PROJECT_NAME}" \ --project-name "${OCP_PROJECT_NAME}" \
--product-build false \ --product-build "${PRODUCT_BUILD}" \
--strimzi-kc-build ${STRIMZI_KC_BUILD} \ --strimzi-kc-build ${STRIMZI_KC_BUILD} \
--apicurio-version "${APICURIO_VERSION}" \ --apicurio-version "${APICURIO_VERSION}" \
--groups-arg "${GROUPS_ARG}" \ --groups-arg "${GROUPS_ARG}" \