From 31a09a34dcd019b78197b03eff16eebcbe1b5690 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 99c63b2d2c95e6d4cb9520ba7b7592da23f776f9 Mon Sep 17 00:00:00 2001 From: Philippe Wang Date: Sun, 5 Nov 2023 19:58:58 -0800 Subject: [PATCH 2/2] CI: dummy commit: modify src/ --- src/dummy | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/dummy diff --git a/src/dummy b/src/dummy new file mode 100644 index 000000000000..e69de29bb2d1 -- GitLab