From 9c43f0187c2a442c30313cba60baf4f71e3ae912 Mon Sep 17 00:00:00 2001 From: Fedor Dudinskiy Date: Tue, 18 Jul 2023 13:03:14 +0200 Subject: [PATCH 1/4] Reflect, that Quarkus dockerfile moved to another repository Follow-up to https://github.com/openshift/release/pull/40279 --- .../OWNERS | 0 .../README.md | 6 +++--- ...openshift-interop-main__quarkus-ocp4.14-lp-interop.yaml} | 4 ++-- .../OWNERS | 0 ...uarkus-qe-quarkus-openshift-interop-main-periodics.yaml} | 4 ++-- ...arkus-qe-quarkus-openshift-interop-main-presubmits.yaml} | 4 ++-- .../quarkus-qe/quarkus-openshift-interop/_pluginconfig.yaml | 4 ++++ .../quarkus-qe/quarkus-test-suite/_pluginconfig.yaml | 4 ---- core-services/sanitize-prow-jobs/_config.yaml | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) rename ci-operator/config/quarkus-qe/{quarkus-test-suite => quarkus-openshift-interop}/OWNERS (100%) rename ci-operator/config/quarkus-qe/{quarkus-test-suite => quarkus-openshift-interop}/README.md (88%) rename ci-operator/config/quarkus-qe/{quarkus-test-suite/quarkus-qe-quarkus-test-suite-main__quarkus-ocp4.14-lp-interop.yaml => quarkus-openshift-interop/quarkus-qe-quarkus-openshift-interop-main__quarkus-ocp4.14-lp-interop.yaml} (96%) rename ci-operator/jobs/quarkus-qe/{quarkus-test-suite => quarkus-openshift-interop}/OWNERS (100%) rename ci-operator/jobs/quarkus-qe/{quarkus-test-suite/quarkus-qe-quarkus-test-suite-main-periodics.yaml => quarkus-openshift-interop/quarkus-qe-quarkus-openshift-interop-main-periodics.yaml} (94%) rename ci-operator/jobs/quarkus-qe/{quarkus-test-suite/quarkus-qe-quarkus-test-suite-main-presubmits.yaml => quarkus-openshift-interop/quarkus-qe-quarkus-openshift-interop-main-presubmits.yaml} (92%) create mode 100644 core-services/prow/02_config/quarkus-qe/quarkus-openshift-interop/_pluginconfig.yaml delete mode 100644 core-services/prow/02_config/quarkus-qe/quarkus-test-suite/_pluginconfig.yaml diff --git a/ci-operator/config/quarkus-qe/quarkus-test-suite/OWNERS b/ci-operator/config/quarkus-qe/quarkus-openshift-interop/OWNERS similarity index 100% rename from ci-operator/config/quarkus-qe/quarkus-test-suite/OWNERS rename to ci-operator/config/quarkus-qe/quarkus-openshift-interop/OWNERS diff --git a/ci-operator/config/quarkus-qe/quarkus-test-suite/README.md b/ci-operator/config/quarkus-qe/quarkus-openshift-interop/README.md similarity index 88% rename from ci-operator/config/quarkus-qe/quarkus-test-suite/README.md rename to ci-operator/config/quarkus-qe/quarkus-openshift-interop/README.md index a7cf47d7c8be..adaa87c7e628 100644 --- a/ci-operator/config/quarkus-qe/quarkus-test-suite/README.md +++ b/ci-operator/config/quarkus-qe/quarkus-openshift-interop/README.md @@ -1,4 +1,4 @@ -# quarkus-qe-quarkus-test-suite +# quarkus-qe-quarkus-openshift-interop ## Table of Contents - [General Information](#general-information) @@ -12,7 +12,7 @@ ## General Information -- **TestRepository**: [quarkus-qe/quarkus-test-suite](https://github.com/quarkus-qe/quarkus-test-suite) +- **TestRepository**: [quarkus-qe/quarkus-openshift-interop](https://github.com/quarkus-qe/quarkus-openshift-interop) ## Purpose @@ -34,7 +34,7 @@ Please see the [`ipi-aws`](https://steps.ci.openshift.org/workflow/ipi-aws) docu Following the test cluster being provisioned, the following dockerfile is used to execute tests: -- The dockerfile to build the image and execute tests is defined at https://github.com/quarkus-qe/quarkus-test-suite/blob/main/.openshift-interop/Dockerfile. +- The dockerfile to build the image and execute tests is defined at https://github.com/quarkus-qe/quarkus-openshift-interop/blob/main/openshift-ci/Dockerfile. ## Prerequisite(s) diff --git a/ci-operator/config/quarkus-qe/quarkus-test-suite/quarkus-qe-quarkus-test-suite-main__quarkus-ocp4.14-lp-interop.yaml b/ci-operator/config/quarkus-qe/quarkus-openshift-interop/quarkus-qe-quarkus-openshift-interop-main__quarkus-ocp4.14-lp-interop.yaml similarity index 96% rename from ci-operator/config/quarkus-qe/quarkus-test-suite/quarkus-qe-quarkus-test-suite-main__quarkus-ocp4.14-lp-interop.yaml rename to ci-operator/config/quarkus-qe/quarkus-openshift-interop/quarkus-qe-quarkus-openshift-interop-main__quarkus-ocp4.14-lp-interop.yaml index f0cab590624f..b6050c6d53fd 100644 --- a/ci-operator/config/quarkus-qe/quarkus-test-suite/quarkus-qe-quarkus-test-suite-main__quarkus-ocp4.14-lp-interop.yaml +++ b/ci-operator/config/quarkus-qe/quarkus-openshift-interop/quarkus-qe-quarkus-openshift-interop-main__quarkus-ocp4.14-lp-interop.yaml @@ -9,7 +9,7 @@ build_root: namespace: openshift tag: golang-1.19 images: -- context_dir: .openshift-interop/ +- context_dir: openshift-ci/ to: quarkus-runner releases: latest: @@ -45,5 +45,5 @@ tests: zz_generated_metadata: branch: main org: quarkus-qe - repo: quarkus-test-suite + repo: quarkus-openshift-interop variant: quarkus-ocp4.14-lp-interop diff --git a/ci-operator/jobs/quarkus-qe/quarkus-test-suite/OWNERS b/ci-operator/jobs/quarkus-qe/quarkus-openshift-interop/OWNERS similarity index 100% rename from ci-operator/jobs/quarkus-qe/quarkus-test-suite/OWNERS rename to ci-operator/jobs/quarkus-qe/quarkus-openshift-interop/OWNERS diff --git a/ci-operator/jobs/quarkus-qe/quarkus-test-suite/quarkus-qe-quarkus-test-suite-main-periodics.yaml b/ci-operator/jobs/quarkus-qe/quarkus-openshift-interop/quarkus-qe-quarkus-openshift-interop-main-periodics.yaml similarity index 94% rename from ci-operator/jobs/quarkus-qe/quarkus-test-suite/quarkus-qe-quarkus-test-suite-main-periodics.yaml rename to ci-operator/jobs/quarkus-qe/quarkus-openshift-interop/quarkus-qe-quarkus-openshift-interop-main-periodics.yaml index df3ff55a387c..44b1c2964ffd 100644 --- a/ci-operator/jobs/quarkus-qe/quarkus-test-suite/quarkus-qe-quarkus-test-suite-main-periodics.yaml +++ b/ci-operator/jobs/quarkus-qe/quarkus-openshift-interop/quarkus-qe-quarkus-openshift-interop-main-periodics.yaml @@ -8,7 +8,7 @@ periodics: extra_refs: - base_ref: main org: quarkus-qe - repo: quarkus-test-suite + repo: quarkus-openshift-interop labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: aws-cspi-qe @@ -16,7 +16,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "4.14" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-quarkus-qe-quarkus-test-suite-main-quarkus-ocp4.14-lp-interop-quarkus-interop-aws + name: periodic-ci-quarkus-qe-quarkus-openshift-interop-main-quarkus-ocp4.14-lp-interop-quarkus-interop-aws reporter_config: slack: channel: '#quarkus-qe' diff --git a/ci-operator/jobs/quarkus-qe/quarkus-test-suite/quarkus-qe-quarkus-test-suite-main-presubmits.yaml b/ci-operator/jobs/quarkus-qe/quarkus-openshift-interop/quarkus-qe-quarkus-openshift-interop-main-presubmits.yaml similarity index 92% rename from ci-operator/jobs/quarkus-qe/quarkus-test-suite/quarkus-qe-quarkus-test-suite-main-presubmits.yaml rename to ci-operator/jobs/quarkus-qe/quarkus-openshift-interop/quarkus-qe-quarkus-openshift-interop-main-presubmits.yaml index 633bc4b63467..b2b55218943f 100644 --- a/ci-operator/jobs/quarkus-qe/quarkus-test-suite/quarkus-qe-quarkus-test-suite-main-presubmits.yaml +++ b/ci-operator/jobs/quarkus-qe/quarkus-openshift-interop/quarkus-qe-quarkus-openshift-interop-main-presubmits.yaml @@ -1,5 +1,5 @@ presubmits: - quarkus-qe/quarkus-test-suite: + quarkus-qe/quarkus-openshift-interop: - agent: kubernetes always_run: true branches: @@ -15,7 +15,7 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "4.14" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-quarkus-qe-quarkus-test-suite-main-quarkus-ocp4.14-lp-interop-images + name: pull-ci-quarkus-qe-quarkus-openshift-interop-main-quarkus-ocp4.14-lp-interop-images rerun_command: /test quarkus-ocp4.14-lp-interop-images spec: containers: diff --git a/core-services/prow/02_config/quarkus-qe/quarkus-openshift-interop/_pluginconfig.yaml b/core-services/prow/02_config/quarkus-qe/quarkus-openshift-interop/_pluginconfig.yaml new file mode 100644 index 000000000000..a643204f95b9 --- /dev/null +++ b/core-services/prow/02_config/quarkus-qe/quarkus-openshift-interop/_pluginconfig.yaml @@ -0,0 +1,4 @@ +plugins: + quarkus-qe/quarkus-openshift-interop: + plugins: + - trigger diff --git a/core-services/prow/02_config/quarkus-qe/quarkus-test-suite/_pluginconfig.yaml b/core-services/prow/02_config/quarkus-qe/quarkus-test-suite/_pluginconfig.yaml deleted file mode 100644 index 697e9f68cb4f..000000000000 --- a/core-services/prow/02_config/quarkus-qe/quarkus-test-suite/_pluginconfig.yaml +++ /dev/null @@ -1,4 +0,0 @@ -plugins: - quarkus-qe/quarkus-test-suite: - plugins: - - trigger diff --git a/core-services/sanitize-prow-jobs/_config.yaml b/core-services/sanitize-prow-jobs/_config.yaml index 7c1240540277..a9932e97ec96 100644 --- a/core-services/sanitize-prow-jobs/_config.yaml +++ b/core-services/sanitize-prow-jobs/_config.yaml @@ -4550,8 +4550,8 @@ buildFarm: - project-codeflare-codeflare-operator-main-presubmits.yaml - project-flotta-flotta-operator-release-4.14-presubmits.yaml - project-flotta-flotta-operator-main-presubmits.yaml - - quarkus-qe-quarkus-test-suite-main-presubmits.yaml - - quarkus-qe-quarkus-test-suite-main-periodics.yaml + - quarkus-qe-quarkus-openshift-interop-main-presubmits.yaml + - quarkus-qe-quarkus-openshift-interop-main-periodics.yaml - quay-quay-bridge-operator-master-periodics.yaml - red-hat-storage-mcg-ms-console-master-presubmits.yaml - quay-quay-bridge-operator-master-presubmits.yaml From ccbbfd7b26f507d3dfe74919cb3ba7685b927f34 Mon Sep 17 00:00:00 2001 From: Fedor Dudinskiy Date: Tue, 18 Jul 2023 15:13:21 +0200 Subject: [PATCH 2/4] Changing cluster name, since pull-request check complains about it Reasons for complaining are not yet clear --- .../quarkus-qe-quarkus-openshift-interop-main-periodics.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/jobs/quarkus-qe/quarkus-openshift-interop/quarkus-qe-quarkus-openshift-interop-main-periodics.yaml b/ci-operator/jobs/quarkus-qe/quarkus-openshift-interop/quarkus-qe-quarkus-openshift-interop-main-periodics.yaml index 44b1c2964ffd..6b1f65a78447 100644 --- a/ci-operator/jobs/quarkus-qe/quarkus-openshift-interop/quarkus-qe-quarkus-openshift-interop-main-periodics.yaml +++ b/ci-operator/jobs/quarkus-qe/quarkus-openshift-interop/quarkus-qe-quarkus-openshift-interop-main-periodics.yaml @@ -1,6 +1,6 @@ periodics: - agent: kubernetes - cluster: build03 + cluster: build05 cron: 0 6 * * 1 decorate: true decoration_config: From 6087bacc50408d79519283f98d9ca2a6e2051b80 Mon Sep 17 00:00:00 2001 From: Fedor Dudinskiy Date: Thu, 20 Jul 2023 09:33:16 +0200 Subject: [PATCH 3/4] Change Jira link --- ...rkus-openshift-interop-main__quarkus-ocp4.14-lp-interop.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/config/quarkus-qe/quarkus-openshift-interop/quarkus-qe-quarkus-openshift-interop-main__quarkus-ocp4.14-lp-interop.yaml b/ci-operator/config/quarkus-qe/quarkus-openshift-interop/quarkus-qe-quarkus-openshift-interop-main__quarkus-ocp4.14-lp-interop.yaml index b6050c6d53fd..86e9955ed14d 100644 --- a/ci-operator/config/quarkus-qe/quarkus-openshift-interop/quarkus-qe-quarkus-openshift-interop-main__quarkus-ocp4.14-lp-interop.yaml +++ b/ci-operator/config/quarkus-qe/quarkus-openshift-interop/quarkus-qe-quarkus-openshift-interop-main__quarkus-ocp4.14-lp-interop.yaml @@ -35,7 +35,7 @@ tests: {"step": "gather-*", "failure_type": "all", "classification": "Other", "jira_project": "LPTOCPCI", "jira_epic": "LPTOCPCI-290"}, {"step": "openshift-*", "failure_type": "all", "classification": "Other", "jira_project": "LPTOCPCI", "jira_epic":"LPTOCPCI-290"}, {"step": "quarkus-execute-tests", "failure_type": "pod_failure", "classification": "Test Execution", "jira_project": "LPTOCPCI", "jira_epic":"LPTOCPCI-290"}, - {"step": "quarkus-execute-tests", "failure_type": "test_failure", "classification": "Test Failure", "jira_project": "QQE", "jira_epic":"LPTOCPCI-290"} + {"step": "quarkus-execute-tests", "failure_type": "test_failure", "classification": "Test Failure", "jira_project": "QUARKUS", "jira_component": "team/qe", "jira_epic":"LPTOCPCI-290"} ] FIREWATCH_DEFAULT_JIRA_PROJECT: LPTOCPCI FIREWATCH_JIRA_SERVER: https://issues.redhat.com From d228dc02dd63e521f7b65ebcd857eb0e8ef0b73c Mon Sep 17 00:00:00 2001 From: Fedor Dudinskiy Date: Fri, 21 Jul 2023 10:14:43 +0200 Subject: [PATCH 4/4] Stop copy failsafe-summary --- .../quarkus/execute-tests/quarkus-execute-tests-commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/quarkus/execute-tests/quarkus-execute-tests-commands.sh b/ci-operator/step-registry/quarkus/execute-tests/quarkus-execute-tests-commands.sh index 3a0d4e9b1c56..274858d2020a 100644 --- a/ci-operator/step-registry/quarkus/execute-tests/quarkus-execute-tests-commands.sh +++ b/ci-operator/step-registry/quarkus/execute-tests/quarkus-execute-tests-commands.sh @@ -36,7 +36,7 @@ mvn -B -V clean verify -fae \ echo "Copying results and xmls to ${ARTIFACT_DIR}" PROJECTS=config,lifecycle-application,http/http-minimum,http/http-minimum-reactive,sql-db/sql-app,monitoring/microprofile-opentracing for PROJECT in ${PROJECTS//","/" "}; do - for FILE in ./$PROJECT/target/failsafe-reports/*.xml; do + for FILE in ./$PROJECT/target/failsafe-reports/TEST-*.xml; do FILENAME=$(basename $FILE) echo $FILENAME cp $FILE ${ARTIFACT_DIR}/junit_${FILENAME}