From 27dc5412f1dfa7f50630f566aae21be975b4d2ce Mon Sep 17 00:00:00 2001 From: Kenjiro Nakayama Date: Thu, 2 Jun 2022 19:03:38 +0900 Subject: [PATCH] Fix minor script error for CI config When creating https://github.com/openshift/release/pull/29082, there are two errors found. - `make test-conformance` and `make test-reconciler` does not exist on serving. (I copied the script from Eventing so it was remained. - Add missing `make RELEASE=ci generate-release`, which is necessary to update the yaml after patched. --- openshift/ci-operator/generate-ci-config.sh | 2 -- openshift/release/create-release-branch.sh | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/openshift/ci-operator/generate-ci-config.sh b/openshift/ci-operator/generate-ci-config.sh index 24c62af04195..f003ecd56085 100755 --- a/openshift/ci-operator/generate-ci-config.sh +++ b/openshift/ci-operator/generate-ci-config.sh @@ -149,8 +149,6 @@ EOF cron="$(generate_cron_expression)" print_single_test "e2e-aws-ocp-${openshift//./}" "make test-e2e" "" "true" "generic-claim" "" - print_single_test "conformance-aws-ocp-${openshift//./}" "make test-conformance" "" "true" "generic-claim" "" - print_single_test "reconciler-aws-ocp-${openshift//./}" "make test-reconciler" "" "true" "generic-claim" "" if [[ "$generate_continuous" == true ]]; then print_single_test "e2e-aws-ocp-${openshift//./}-continuous" "make test-e2e" "" "true" "generic-claim" "${cron}" diff --git a/openshift/release/create-release-branch.sh b/openshift/release/create-release-branch.sh index 9e76b5797181..24b0f6874353 100755 --- a/openshift/release/create-release-branch.sh +++ b/openshift/release/create-release-branch.sh @@ -30,5 +30,6 @@ if [ -d "openshift/patches-${release}" ]; then fi git apply $PATCH_DIR/* make RELEASE=$release generate-release +make RELEASE=ci generate-release git add . git commit -am ":fire: Apply carried patches."