From 86bc34684e4a9b7b560f336198e14bb782564f9b Mon Sep 17 00:00:00 2001 From: Jiri Novotny Date: Wed, 9 Mar 2022 17:36:27 +0100 Subject: [PATCH] DBZ-4601 Name and tag cleanup --- .../{Dockerfile.AMQ => Dockerfile.Strimzi} | 0 ...ream_kafka_connect_prepare_pipeline.groovy | 3 ++- jenkins-jobs/scripts/build-connect-image.sh | 2 +- .../scripts/upstream-kafka-connect-prepare.sh | 26 +++++++++++-------- 4 files changed, 18 insertions(+), 13 deletions(-) rename jenkins-jobs/docker/{Dockerfile.AMQ => Dockerfile.Strimzi} (100%) diff --git a/jenkins-jobs/docker/Dockerfile.AMQ b/jenkins-jobs/docker/Dockerfile.Strimzi similarity index 100% rename from jenkins-jobs/docker/Dockerfile.AMQ rename to jenkins-jobs/docker/Dockerfile.Strimzi diff --git a/jenkins-jobs/pipelines/upstream_kafka_connect_prepare_pipeline.groovy b/jenkins-jobs/pipelines/upstream_kafka_connect_prepare_pipeline.groovy index 3abf438fc..2156621c5 100644 --- a/jenkins-jobs/pipelines/upstream_kafka_connect_prepare_pipeline.groovy +++ b/jenkins-jobs/pipelines/upstream_kafka_connect_prepare_pipeline.groovy @@ -108,7 +108,7 @@ pipeline { sh ''' set -x cd "${WORKSPACE}/debezium" - ./jenkins-jobs/scripts/upstream-kafka-connect-prepare.sh \\ + ./jenkins-jobs/scripts/upstream-kafka-connect-prepare.sh \\ --dir="${WORKSPACE}" \\ --tags="${EXTRA_IMAGE_TAGS}" \\ --auto-tag="${AUTO_TAG}" \\ @@ -117,6 +117,7 @@ pipeline { --dest-pass="${QUAY_PASSWORD}" \\ --kc-base-tag="${KC_BASE_TAG}" \\ --kafka-version="${KAFKA_VERSION}" \\ + --apicurio-version="${APICURIO_VERSION}" \\ --img-output="${WORKSPACE}/published_image_dbz.txt" \\ --oracle-included="${ORACLE_INCLUDED}" ''' diff --git a/jenkins-jobs/scripts/build-connect-image.sh b/jenkins-jobs/scripts/build-connect-image.sh index a77ea8da9..4a19fa985 100755 --- a/jenkins-jobs/scripts/build-connect-image.sh +++ b/jenkins-jobs/scripts/build-connect-image.sh @@ -2,7 +2,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" COPY_IMAGES=true REGISTRY="quay.io" -DOCKER_FILE=${DIR}/../docker/Dockerfile.AMQ +DOCKER_FILE=${DIR}/../docker/Dockerfile.Strimzi PLUGIN_DIR="plugins" EXTRA_LIBS="" diff --git a/jenkins-jobs/scripts/upstream-kafka-connect-prepare.sh b/jenkins-jobs/scripts/upstream-kafka-connect-prepare.sh index 38c93e62e..3bbe35b14 100755 --- a/jenkins-jobs/scripts/upstream-kafka-connect-prepare.sh +++ b/jenkins-jobs/scripts/upstream-kafka-connect-prepare.sh @@ -1,11 +1,11 @@ #! /usr/bin/env bash set -x DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -DOCKER_FILE=${DIR}/../docker/Dockerfile.AMQ +DOCKER_FILE=${DIR}/../docker/Dockerfile.Strimzi PLUGIN_DIR="plugins" -OPTS=$(getopt -o d:f:r:o:t:a: --long dir:,dockerfile:,registry:,organisation:,tags:,auto-tag:,kc-base-tag:,kafka-version:,dest-login:,dest-pass:,img-output:,oracle-included: -n 'parse-options' -- "$@") +OPTS=$(getopt -o d:f:r:o:t:a: --long dir:,dockerfile:,registry:,organisation:,tags:,auto-tag:,kc-base-tag:,kafka-version:,apicurio-version:,dest-login:,dest-pass:,img-output:,oracle-included: -n 'parse-options' -- "$@") if [ $? != 0 ] ; then echo "Failed parsing options." >&2 ; exit 1 ; fi eval set -- "$OPTS" @@ -20,6 +20,7 @@ while true; do -a | --auto-tag ) AUTO_TAG=$2; shift; shift ;; --kc-base-tag ) CONNECT_BASE_TAG=$2; shift; shift ;; --kafka-version ) KAFKA_VERSION=$2; shift; shift ;; + --apicurio-version ) APICURIO_VERSION=$2; shift; shift ;; --dest-login ) DEST_LOGIN=$2; shift; shift ;; --dest-pass ) DEST_PASS=$2; shift; shift ;; --img-output ) IMAGE_OUTPUT_FILE=$2; shift; shift ;; @@ -52,18 +53,21 @@ cp ~/.m2/repository/com/ibm/db2/jcc/*/jcc-*.jar debezium-connector-db2/ cp ~/.m2/repository/com/oracle/database/jdbc/ojdbc8/*/ojdbc8-*.jar debezium-connector-oracle/ cp ~/.m2/repository/io/apicurio/apicurio-registry-distro-connect-converter/*/apicurio-registry-*.zip . -unzip -o apicurio-registry-*.zip -d debezium-connector-mysql/ -unzip -o apicurio-registry-*.zip -d debezium-connector-postgres/ -unzip -o apicurio-registry-*.zip -d debezium-connector-mongodb/ -unzip -o apicurio-registry-*.zip -d debezium-connector-sqlserver/ -unzip -o apicurio-registry-*.zip -d debezium-connector-db2/ -unzip -o apicurio-registry-*.zip -d debezium-connector-oracle/ + +CONNECTORS='debezium-connector-oracle debezium-connector-db2 debezium-connector-sqlserver'\ +' debezium-connector-mongodb debezium-connector-postgres debezium-connector-mysql' + +for connector in $CONNECTORS +do + unzip -o apicurio-registry-*.zip -d "${connector}/" +done + rm apicurio-registry-*.zip if [ "${ORACLE}" = "false" ] ; then rm -rf debezium-connector-oracle else - echo "Changing quay organisation to private rh-integration since ORACLE connector is included" + echo "Changing quay organisation to private rh_integration since ORACLE connector is included" ORGANISATION="rh_integration" fi @@ -72,8 +76,8 @@ popd || exit echo "Copying Dockerfile to" "${BUILD_DIR}" cp "$DOCKER_FILE" "${BUILD_DIR}/Dockerfile" -image=${REGISTRY}/${ORGANISATION}/testing-openshift-connect -target=${image}:kafka-${KAFKA_VERSION}-${project_version} +image=${REGISTRY}/${ORGANISATION}/test-strimzi-kafka +target=${image}:strz-${CONNECT_BASE_TAG}-kafka-${KAFKA_VERSION}-apc-${APICURIO_VERSION}-dbz-${project_version} pushd "${BUILD_DIR}" || exit echo "[Build] Building $target"