From c4c9af40108aa7cb611fda23b80ae8fdeedf96c7 Mon Sep 17 00:00:00 2001 From: Philippe Wang Date: Thu, 14 Dec 2023 11:19:52 -0800 Subject: [PATCH 1/2] do not merge: for testing purposes --- .../ci/jobs/prepare_release/docker_merge_manifests_release.yml | 3 --- .../ci/jobs/prepare_release/docker_merge_manifests_test.yml | 3 --- 2 files changed, 6 deletions(-) diff --git a/.gitlab/ci/jobs/prepare_release/docker_merge_manifests_release.yml b/.gitlab/ci/jobs/prepare_release/docker_merge_manifests_release.yml index d8a8fa57aabe..3dae5b95fbc5 100644 --- a/.gitlab/ci/jobs/prepare_release/docker_merge_manifests_release.yml +++ b/.gitlab/ci/jobs/prepare_release/docker_merge_manifests_release.yml @@ -10,9 +10,6 @@ docker:merge_manifests: extends: - .docker_auth_template - .image_template__docker - needs: - - oc.docker:amd64 - - oc.docker:arm64 stage: prepare_release variables: CI_DOCKER_HUB: "true" diff --git a/.gitlab/ci/jobs/prepare_release/docker_merge_manifests_test.yml b/.gitlab/ci/jobs/prepare_release/docker_merge_manifests_test.yml index 37f70b7c661c..17b69b2aff45 100644 --- a/.gitlab/ci/jobs/prepare_release/docker_merge_manifests_test.yml +++ b/.gitlab/ci/jobs/prepare_release/docker_merge_manifests_test.yml @@ -10,9 +10,6 @@ docker:merge_manifests: extends: - .docker_auth_template - .image_template__docker - needs: - - oc.docker:amd64 - - oc.docker:arm64 stage: prepare_release variables: CI_DOCKER_HUB: "false" -- GitLab From 042efd85a1afe87e5cffdc18b57d985bf2d46935 Mon Sep 17 00:00:00 2001 From: Philippe Wang Date: Wed, 29 Nov 2023 11:27:50 -0800 Subject: [PATCH 2/2] CI: dummy change to .gitlab-ci.yml, do not merge --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 584823ae3804..ea7830b94b17 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -218,3 +218,5 @@ include: - local: .gitlab/ci/pipelines/schedule_extended_test.yml rules: - if: '$CI_PIPELINE_SOURCE == "schedule" && $TZ_SCHEDULE_KIND == "EXTENDED_TESTS"' + +# dummy change - do not merge me -- GitLab