From 431b75d2448eadcc715d897e1ea7350aaeff00db Mon Sep 17 00:00:00 2001 From: Nitya Dhanushkodi Date: Thu, 17 Nov 2022 11:56:08 -0800 Subject: [PATCH 1/2] add release line for 1.0.x --- .circleci/config.yml | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e320c5df53..f64ca56f4d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1287,8 +1287,7 @@ workflows: - cleanup-azure-resources - cleanup-eks-resources - - nightly-acceptance-tests-release: + nightly-acceptance-tests-release-0.49.x: description: | Tests which run on a release branch nightly. These exist separate from the main acceptance tests so that they can run at their own cadence, but @@ -1316,18 +1315,38 @@ workflows: - acceptance-gke-cni-1-23: requires: - acceptance-gke-1-23 - - acceptance-eks-1-21: + - acceptance-tproxy: requires: - dev-upload-docker - - acceptance-eks-cni-1-21: + + nightly-acceptance-tests-release-1.0.x: + description: | + Tests which run on a release branch nightly. These exist separate from the main + acceptance tests so that they can run at their own cadence, but + contains the same sequence of jobs. + triggers: + - schedule: + cron: "0 0 * * *" # Run at 12 am UTC (5 pm PST) + filters: + branches: + only: + - release/1.0.x + jobs: + - build-distro: + OS: "linux" + ARCH: "amd64 arm64" + name: build-distros-linux + - dev-upload-docker: requires: - - acceptance-eks-1-21 - - acceptance-aks-1-22: + - build-distros-linux + # Disable until we can use UBI images. + # - acceptance-openshift + - acceptance-gke-1-23: requires: - dev-upload-docker - - acceptance-aks-cni-1-22: + - acceptance-gke-cni-1-23: requires: - - acceptance-aks-1-22 + - acceptance-gke-1-23 - acceptance-tproxy: requires: - dev-upload-docker From 29eda97620a1f32f80183ddfd7a587535ad20f45 Mon Sep 17 00:00:00 2001 From: Nitya Dhanushkodi Date: Thu, 17 Nov 2022 12:15:12 -0800 Subject: [PATCH 2/2] flatten --- .circleci/config.yml | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f64ca56f4d..34bbc520a5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1287,7 +1287,7 @@ workflows: - cleanup-azure-resources - cleanup-eks-resources - nightly-acceptance-tests-release-0.49.x: + nightly-acceptance-tests-release: description: | Tests which run on a release branch nightly. These exist separate from the main acceptance tests so that they can run at their own cadence, but @@ -1299,37 +1299,6 @@ workflows: branches: only: - release/0.49.x - jobs: - - build-distro: - OS: "linux" - ARCH: "amd64 arm64" - name: build-distros-linux - - dev-upload-docker: - requires: - - build-distros-linux - # Disable until we can use UBI images. - # - acceptance-openshift - - acceptance-gke-1-23: - requires: - - dev-upload-docker - - acceptance-gke-cni-1-23: - requires: - - acceptance-gke-1-23 - - acceptance-tproxy: - requires: - - dev-upload-docker - - nightly-acceptance-tests-release-1.0.x: - description: | - Tests which run on a release branch nightly. These exist separate from the main - acceptance tests so that they can run at their own cadence, but - contains the same sequence of jobs. - triggers: - - schedule: - cron: "0 0 * * *" # Run at 12 am UTC (5 pm PST) - filters: - branches: - only: - release/1.0.x jobs: - build-distro: