From 1ffaf6b0b5974d5290c6f5c07e6f8784f218ebe9 Mon Sep 17 00:00:00 2001 From: Ondrej Babec Date: Wed, 17 Jul 2024 14:00:20 +0200 Subject: [PATCH] [ci] Rename maven global env variable because of 3.9+ changes --- .packit.yaml | 22 ++++++++++---------- debezium-testing/tmt/plans/main.fmf | 21 ++++++++++++------- debezium-testing/tmt/tests/debezium/main.fmf | 2 +- debezium-testing/tmt/tests/debezium/test.sh | 8 +++---- 4 files changed, 30 insertions(+), 23 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 018809da6..5423185bf 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -9,7 +9,7 @@ jobs: # Suffix for job name identifier: "postgres-12-decoderbufs" targets: - - centos-stream-8-x86_64 + - centos-stream-9 skip_build: true manual_trigger: true labels: @@ -29,7 +29,7 @@ jobs: # Suffix for job name identifier: "postgres-12-pgoutput" targets: - - centos-stream-8-x86_64 + - centos-stream-9 skip_build: true manual_trigger: true labels: @@ -49,7 +49,7 @@ jobs: # Suffix for job name identifier: "postgres-15-decoderbufs" targets: - - centos-stream-8-x86_64 + - centos-stream-9 skip_build: true manual_trigger: true labels: @@ -70,7 +70,7 @@ jobs: # Suffix for job name identifier: "postgres-15-pgoutput" targets: - - centos-stream-8-x86_64 + - centos-stream-9 skip_build: true manual_trigger: true labels: @@ -90,7 +90,7 @@ jobs: # Suffix for job name identifier: "mysql-8-none" targets: - - centos-stream-8-x86_64 + - centos-stream-9 skip_build: true manual_trigger: true labels: @@ -110,7 +110,7 @@ jobs: # Suffix for job name identifier: "mysql-8-assembly" targets: - - centos-stream-8-x86_64 + - centos-stream-9 skip_build: true manual_trigger: true labels: @@ -130,7 +130,7 @@ jobs: # Suffix for job name identifier: "sqlserver-2017" targets: - - centos-stream-8-x86_64 + - centos-stream-9 skip_build: true manual_trigger: true labels: @@ -149,7 +149,7 @@ jobs: # Suffix for job name identifier: "sqlserver-2022" targets: - - centos-stream-8-x86_64 + - centos-stream-9 skip_build: true manual_trigger: true labels: @@ -168,7 +168,7 @@ jobs: # Suffix for job name identifier: "mongodb-4" targets: - - centos-stream-8-x86_64 + - centos-stream-9 skip_build: true manual_trigger: true labels: @@ -188,7 +188,7 @@ jobs: # Suffix for job name identifier: "mongodb-5" targets: - - centos-stream-8-x86_64 + - centos-stream-9 skip_build: true manual_trigger: true labels: @@ -208,7 +208,7 @@ jobs: # Suffix for job name identifier: "mongodb-6" targets: - - centos-stream-8-x86_64 + - centos-stream-9 skip_build: true manual_trigger: true labels: diff --git a/debezium-testing/tmt/plans/main.fmf b/debezium-testing/tmt/plans/main.fmf index 46d3cc0ae..d185a1815 100644 --- a/debezium-testing/tmt/plans/main.fmf +++ b/debezium-testing/tmt/plans/main.fmf @@ -21,7 +21,6 @@ prepare: how: install package: - wget - - java-17-openjdk-devel - xz - make - git @@ -40,14 +39,22 @@ prepare: sudo yum install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin sudo systemctl enable docker --now - - name: Install mvn + - name: Install sdkman and Java how: shell script: | - mkdir -p /usr/share/maven /usr/share/maven/ref - curl -fsSL -o /tmp/apache-maven.tar.gz https://apache.osuosl.org/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz - tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 - rm -f /tmp/apache-maven.tar.gz - ln -s /usr/share/maven/bin/mvn /usr/bin/mvn + curl -s "https://get.sdkman.io" | bash + source ${HOME}/.sdkman/bin/sdkman-init.sh && yes | sdk install java 21.0.3-tem || true + + + - name: Set Java 21 as default + how: shell + script: | + source ${HOME}/.sdkman/bin/sdkman-init.sh && yes | sdk default java 21.0.3-tem || true + + - name: Install Maven + how: shell + script: | + source ${HOME}/.sdkman/bin/sdkman-init.sh && yes | sdk install maven 3.9.8 || true - name: Disable Chronyd service how: shell diff --git a/debezium-testing/tmt/tests/debezium/main.fmf b/debezium-testing/tmt/tests/debezium/main.fmf index 97c53d1f2..06ddb1095 100644 --- a/debezium-testing/tmt/tests/debezium/main.fmf +++ b/debezium-testing/tmt/tests/debezium/main.fmf @@ -2,7 +2,7 @@ test: ./test.sh duration: 2h environment: - MAVEN_ARGS: "-U -am -fae -Papicurio -Dinsecure.repositories=WARN -pl debezium-bom --no-transfer-progress" + CUSTOM_MAVEN_ARGS: "-U -am -fae -Papicurio -Dinsecure.repositories=WARN --no-transfer-progress -pl debezium-bom" /mysql: summary: Run mysql connector functional tests diff --git a/debezium-testing/tmt/tests/debezium/test.sh b/debezium-testing/tmt/tests/debezium/test.sh index 44dec3fcd..6c32c2ac8 100755 --- a/debezium-testing/tmt/tests/debezium/test.sh +++ b/debezium-testing/tmt/tests/debezium/test.sh @@ -6,7 +6,7 @@ echo $PWD if [ "$TEST_PROFILE" = "mysql" ] then - mvn clean verify ${MAVEN_ARGS},debezium-connector-mysql \ + mvn clean verify ${CUSTOM_MAVEN_ARGS},debezium-connector-mysql \ -Dversion.mysql.server=${MYSQL_VERSION} \ ${EXECUTION_ARG:-} \ -Dmysql.port=4301 \ @@ -16,7 +16,7 @@ then -P${PROFILE} elif [ "$TEST_PROFILE" = "postgres" ] then - mvn clean verify ${MAVEN_ARGS},debezium-connector-postgres \ + mvn clean verify ${CUSTOM_MAVEN_ARGS},debezium-connector-postgres \ -Dpostgres.port=55432 \ ${ORACLE_ARG:-} \ ${EXECUTION_ARG:-} \ @@ -63,11 +63,11 @@ then else export DATABASE_IMAGE="mcr.microsoft.com/mssql/server:2022-latest" fi - mvn clean verify ${MAVEN_ARGS},debezium-connector-sqlserver \ + mvn clean verify ${CUSTOM_MAVEN_ARGS},debezium-connector-sqlserver \ ${EXECUTION_ARG:-} \ -Ddocker.db="${DATABASE_IMAGE}" else - mvn clean verify ${MAVEN_ARGS},debezium-connector-mongodb \ + mvn clean verify ${CUSTOM_MAVEN_ARGS},debezium-connector-mongodb \ ${EXECUTION_ARG:-} \ -Dversion.mongo.server=${MONGODB_VERSION} fi