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

Update update-ci.sh #1239

Merged
openshift-merge-robot merged 4 commits into from
Sep 8, 2022
Merged

Update update-ci.sh #1239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4e6907c
Update update-ci.sh
nak3 Sep 8, 2022
a453445
Fix continuous name
nak3 Sep 8, 2022
a8e1031
Use TLS in the same file
nak3 Sep 8, 2022
84d75a7
Add 4.10 and drop 4.6, 4.7
nak3 Sep 8, 2022
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
7 changes: 4 additions & 3 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 @@ -150,10 +150,11 @@ EOF
cron="$(generate_cron_expression)"

print_single_test "e2e-aws-ocp-${openshift//./}" "make test-e2e" "" "true" "generic-claim" ""

if [[ "$internal_tls_enabled" == true ]]; then
print_single_test "e2e-aws-ocp-${openshift//./}-continuous" "make test-e2e-tls" "" "true" "generic-claim" "${cron}"
elif [[ "$generate_continuous" == true ]]; then
print_single_test "e2e-aws-ocp-tls-${openshift//./}" "make test-e2e-tls" "" "true" "generic-claim" "${cron}"
fi

if [[ "$generate_continuous" == true ]]; then
print_single_test "e2e-aws-ocp-${openshift//./}-continuous" "make test-e2e" "" "true" "generic-claim" "${cron}"
fi

Expand Down
4 changes: 1 addition & 3 deletions openshift/ci-operator/update-ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,10 @@ PERIODIC_CONFIG=$PERIODIC_CONFIGDIR/openshift-knative-serving-release-$VERSION-p
CURDIR=$(dirname $0)

# $1=branch $2=openshift $3=promotion_disabled $4=generate_continuous $5=internal_tls_enabled(optional)
$CURDIR/generate-ci-config.sh knative-$VERSION 4.6 true false > ${CONFIG}__46.yaml
$CURDIR/generate-ci-config.sh knative-$VERSION 4.7 true false > ${CONFIG}__47.yaml
$CURDIR/generate-ci-config.sh knative-$VERSION 4.8 true false > ${CONFIG}__48.yaml
$CURDIR/generate-ci-config.sh knative-$VERSION 4.9 true false > ${CONFIG}__49.yaml
$CURDIR/generate-ci-config.sh knative-$VERSION 4.10 true false > ${CONFIG}__410.yaml
$CURDIR/generate-ci-config.sh knative-$VERSION 4.11 true false true > ${CONFIG}__411-tls.yaml
$CURDIR/generate-ci-config.sh knative-$VERSION 4.11 false true true > ${CONFIG}__411.yaml

Copy link
Copy Markdown

@mgencur mgencur Sep 8, 2022

Choose a reason for hiding this comment

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

It's looking better now. But 4.10 is completely missing here.
According to https://docs.google.com/document/d/1s0UrrCDh3b7TrqbKU0X7D62L7AccyxqtjfoxeiZ2vXo/edit#heading=h.btnn1nimzwdy the Serverless 1.25 release should still support 4.6 but Serverless 1.26 will support OCP 4.8 and newer.
I'm wondering if you want to drop 4.6, 4.7 from here and add 4.10 back.
On a general note. It might be sufficient to test on the oldest and newest. So, in theory having 4.8 and 4.11 should be sufficient. But I will leave it to you. Testing all versions from 4.6 to 4.11 sounds like an overkill.
WDYT?

Copy link
Copy Markdown
Author

@nak3 nak3 Sep 8, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Sure, sounds good to me. Updated.
I will update https://github.com/openshift/release later.

# Append missing lines to the mirror file.
if [[ "$VERSION" != "next" ]]; then
Expand Down