Skip to content
This repository was archived by the owner on Dec 1, 2022. It is now read-only.

Fix minor script error for CI config #1134

Merged
openshift-merge-robot merged 1 commit into from
Jun 3, 2022
Merged

Fix minor script error for CI config #1134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions openshift/ci-operator/generate-ci-config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
1 change: 1 addition & 0 deletions openshift/release/create-release-branch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Copy Markdown

@skonto skonto Jun 3, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess that simply adds the label "1.x.0" as done manually here #1136 and is also missing from https://github.com/openshift/knative-serving/blob/release-v1.4/openshift/release/knative-serving-ci.yaml correct?
Over time make generate-release was minimized to simply update labels it seems: https://github.com/openshift/knative-serving/blob/main/openshift/release/resolve.sh#L21-L23 (the comment there is wrong obviously).

git add .
git commit -am ":fire: Apply carried patches."