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

[release-v1.7] Update update-ci.sh #1241

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

[release-v1.7] Update update-ci.sh #1241

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
b2bc581
Update update-ci.sh
nak3 Sep 8, 2022
d0deb43
Fix continuous name
nak3 Sep 8, 2022
7accce2
Use TLS in the same file
nak3 Sep 8, 2022
fa0c31e
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

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