DBZ-4601 Name and tag cleanup

This commit is contained in:
Jiri Novotny 2022-03-09 17:36:27 +01:00 committed by Jakub Cechacek
parent 1425c9208d
commit 86bc34684e
4 changed files with 18 additions and 13 deletions

View File

@ -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}"
'''

View File

@ -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=""

View File

@ -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"