From 4e6907c6f602bcd8fefcdd67d6602ceebb00958c Mon Sep 17 00:00:00 2001
From: Kenjiro Nakayama <nakayamakenjiro@gmail.com>
Date: Thu, 8 Sep 2022 10:42:59 +0900
Subject: [PATCH 1/4] Update update-ci.sh

---
 openshift/ci-operator/update-ci.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openshift/ci-operator/update-ci.sh b/openshift/ci-operator/update-ci.sh
index f264ac5f7302..f6f9532f5371 100755
--- a/openshift/ci-operator/update-ci.sh
+++ b/openshift/ci-operator/update-ci.sh
@@ -44,8 +44,8 @@ $CURDIR/generate-ci-config.sh knative-$VERSION 4.6 true false > ${CONFIG}__46.ya
 $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 true false true > ${CONFIG}__tls.yaml
+$CURDIR/generate-ci-config.sh knative-$VERSION 4.11 false true > ${CONFIG}__411.yaml
 
 # Append missing lines to the mirror file.
 if [[ "$VERSION" != "next" ]]; then

From a453445004aec98bb50dfbd76d16c52988292e32 Mon Sep 17 00:00:00 2001
From: Kenjiro Nakayama <nakayamakenjiro@gmail.com>
Date: Thu, 8 Sep 2022 12:59:47 +0900
Subject: [PATCH 2/4] Fix continuous name

---
 openshift/ci-operator/generate-ci-config.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/openshift/ci-operator/generate-ci-config.sh b/openshift/ci-operator/generate-ci-config.sh
index cd66386a9c45..fecb8f9e63cb 100755
--- a/openshift/ci-operator/generate-ci-config.sh
+++ b/openshift/ci-operator/generate-ci-config.sh
@@ -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
 

From a8e10314b68c063e8e8f2498835aa833046a0197 Mon Sep 17 00:00:00 2001
From: Kenjiro Nakayama <nakayamakenjiro@gmail.com>
Date: Thu, 8 Sep 2022 15:32:45 +0900
Subject: [PATCH 3/4] Use TLS in the same file

---
 openshift/ci-operator/update-ci.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openshift/ci-operator/update-ci.sh b/openshift/ci-operator/update-ci.sh
index f6f9532f5371..77b15befff3d 100755
--- a/openshift/ci-operator/update-ci.sh
+++ b/openshift/ci-operator/update-ci.sh
@@ -44,8 +44,7 @@ $CURDIR/generate-ci-config.sh knative-$VERSION 4.6 true false > ${CONFIG}__46.ya
 $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.11 true false true > ${CONFIG}__tls.yaml
-$CURDIR/generate-ci-config.sh knative-$VERSION 4.11 false true > ${CONFIG}__411.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

From 84d75a7f1439966507dc6b9e6545c39af4aaf2fb Mon Sep 17 00:00:00 2001
From: Kenjiro Nakayama <nakayamakenjiro@gmail.com>
Date: Thu, 8 Sep 2022 16:21:34 +0900
Subject: [PATCH 4/4] Add 4.10 and drop 4.6, 4.7

---
 openshift/ci-operator/update-ci.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openshift/ci-operator/update-ci.sh b/openshift/ci-operator/update-ci.sh
index 77b15befff3d..37ef7368948f 100755
--- a/openshift/ci-operator/update-ci.sh
+++ b/openshift/ci-operator/update-ci.sh
@@ -40,10 +40,9 @@ 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 false true true > ${CONFIG}__411.yaml
 
 # Append missing lines to the mirror file.