From 8d4568b4079dfe45f17748a806da0a42ff9c41db Mon Sep 17 00:00:00 2001 From: rlieberman-splunk Date: Tue, 10 Dec 2024 09:31:34 -0600 Subject: [PATCH] use new label to test app framework tests that hang during teardown --- .../workflows/build-test-push-workflow.yml | 10 +++--- .github/workflows/int-test-workflow.yml | 20 +++++------ .../workflows/manual-int-test-workflow.yml | 10 +----- .../namespace-scope-int-workflow.yml | 10 +----- .../workflows/nightly-int-test-workflow.yml | 10 +----- .../s1/appframework_aws_test.go | 34 +++++++++---------- 6 files changed, 35 insertions(+), 59 deletions(-) diff --git a/.github/workflows/build-test-push-workflow.yml b/.github/workflows/build-test-push-workflow.yml index 4ca3b8661..fe0325adc 100644 --- a/.github/workflows/build-test-push-workflow.yml +++ b/.github/workflows/build-test-push-workflow.yml @@ -165,11 +165,11 @@ jobs: matrix: test: [ basic, - appframeworksS1, - managerappframeworkc3, - managerappframeworkm4, - managersecret, - managermc, + testnewlabelforteardown, + # managerappframeworkc3, + # managerappframeworkm4, + # managersecret, + # managermc, ] runs-on: ubuntu-latest env: diff --git a/.github/workflows/int-test-workflow.yml b/.github/workflows/int-test-workflow.yml index cb0dd7d9f..aaed40604 100644 --- a/.github/workflows/int-test-workflow.yml +++ b/.github/workflows/int-test-workflow.yml @@ -55,16 +55,16 @@ jobs: matrix: test: [ - appframeworksS1, - managerappframeworkc3, - managerappframeworkm4, - managersecret, - managersmartstore, - managermc1, - managermc2, - managercrcrud, - licensemanager, - managerdeletecr, + testnewlabelforteardown, + # managerappframeworkc3, + # managerappframeworkm4, + # managersecret, + # managersmartstore, + # managermc1, + # managermc2, + # managercrcrud, + # licensemanager, + # managerdeletecr, ] runs-on: ubuntu-latest needs: build-operator-image diff --git a/.github/workflows/manual-int-test-workflow.yml b/.github/workflows/manual-int-test-workflow.yml index a5cf70cbc..1b7bfbc2e 100644 --- a/.github/workflows/manual-int-test-workflow.yml +++ b/.github/workflows/manual-int-test-workflow.yml @@ -13,7 +13,7 @@ jobs: matrix: test: [ - appframeworksS1, + testnewlabelforteardown, managerappframeworkc3, managerappframeworkm4, managersecret, @@ -23,14 +23,6 @@ jobs: managerscaling, managercrcrud, licensemanager, - masterappframeworkc3, - masterappframeworkm4, - mastersecret, - mastersmartstore, - mastermc, - masterscaling, - mastercrcrud, - licensemaster, ] runs-on: ubuntu-latest env: diff --git a/.github/workflows/namespace-scope-int-workflow.yml b/.github/workflows/namespace-scope-int-workflow.yml index 973b43c13..40f1d1050 100644 --- a/.github/workflows/namespace-scope-int-workflow.yml +++ b/.github/workflows/namespace-scope-int-workflow.yml @@ -9,7 +9,7 @@ jobs: matrix: test: [ - appframeworksS1, + testnewlabelforteardown, managerappframeworkc3, managerappframeworkm4, managersecret, @@ -19,14 +19,6 @@ jobs: managerscaling, managercrcrud, licensemanager, - masterappframeworkc3, - masterappframeworkm4, - mastersecret, - mastersmartstore, - mastermc, - masterscaling, - mastercrcrud, - licensemaster, ] runs-on: ubuntu-latest env: diff --git a/.github/workflows/nightly-int-test-workflow.yml b/.github/workflows/nightly-int-test-workflow.yml index e10aa1120..a997b80e6 100644 --- a/.github/workflows/nightly-int-test-workflow.yml +++ b/.github/workflows/nightly-int-test-workflow.yml @@ -53,7 +53,7 @@ jobs: matrix: test: [ - appframeworksS1, + testnewlabelforteardown, managerappframeworkc3, managerappframeworkm4, managersecret, @@ -63,14 +63,6 @@ jobs: managerscaling, managercrcrud, licensemanager, - masterappframeworkc3, - masterappframeworkm4, - mastersecret, - mastersmartstore, - mastermc, - masterscaling, - mastercrcrud, - licensemaster, ] runs-on: ubuntu-latest needs: build-operator-image diff --git a/test/appframework_aws/s1/appframework_aws_test.go b/test/appframework_aws/s1/appframework_aws_test.go index 51f360820..8f5311e0c 100644 --- a/test/appframework_aws/s1/appframework_aws_test.go +++ b/test/appframework_aws/s1/appframework_aws_test.go @@ -79,7 +79,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("smoke, s1, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, install apps then upgrade them", func() { + It("smoke, s1, testnewlabelforteardown, appframework: can deploy a Standalone instance with App Framework enabled, install apps then upgrade them", func() { /* Test Steps ################## SETUP #################### @@ -250,7 +250,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("smoke, s1, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, install apps then downgrade them", func() { + It("smoke, s1, testnewlabelforteardown, appframework: can deploy a Standalone instance with App Framework enabled, install apps then downgrade them", func() { /* Test Steps ################## SETUP #################### @@ -413,7 +413,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("s1, smoke, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, install apps, scale up, install apps on new pod, scale down", func() { + It("s1, smoke, testnewlabelforteardown, appframework: can deploy a Standalone instance with App Framework enabled, install apps, scale up, install apps on new pod, scale down", func() { /* Test Steps ################## SETUP #################### @@ -608,7 +608,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("s1, integration, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, install apps, scale up, upgrade apps", func() { + It("s1, integration, testnewlabelforteardown, appframework: can deploy a Standalone instance with App Framework enabled, install apps, scale up, upgrade apps", func() { /* Test Steps ################## SETUP #################### @@ -742,7 +742,7 @@ var _ = Describe("s1appfw test", func() { // ES App Installation not supported at the time. Will be added back at a later time. Context("Standalone deployment (S1) with App Framework", func() { - It("s1, integration, appframeworksS1, appframework: can deploy a Standalone and have ES app installed", func() { + It("s1, integration, testnewlabelforteardown, appframework: can deploy a Standalone and have ES app installed", func() { /* Test Steps ################## SETUP #################### @@ -843,7 +843,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("integration, s1, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled and install around 350MB of apps at once", func() { + It("integration, s1, testnewlabelforteardown, appframework: can deploy a Standalone instance with App Framework enabled and install around 350MB of apps at once", func() { /* Test Steps ################## SETUP #################### @@ -912,7 +912,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("s1, smoke, appframeworksS1, appframework: can deploy a standalone instance with App Framework enabled for manual poll", func() { + It("s1, smoke, testnewlabelforteardown, appframework: can deploy a standalone instance with App Framework enabled for manual poll", func() { /* Test Steps ################## SETUP #################### @@ -1090,7 +1090,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("integration, s1, appframeworksS1, appframework: can deploy Several standalone CRs in the same namespace with App Framework enabled", func() { + It("integration, s1, testnewlabelforteardown, appframework: can deploy Several standalone CRs in the same namespace with App Framework enabled", func() { /* Test Steps ################## SETUP #################### @@ -1191,7 +1191,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("integration, s1, appframeworksS1, appframework: can add new apps to app source while install is in progress and have all apps installed", func() { + It("integration, s1, testnewlabelforteardown, appframework: can add new apps to app source while install is in progress and have all apps installed", func() { /* Test Steps ################## SETUP #################### @@ -1303,7 +1303,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("integration, s1, appframeworksS1, appframework: Deploy a Standalone instance with App Framework enabled and reset operator pod while app install is in progress", func() { + It("integration, s1, testnewlabelforteardown, appframework: Deploy a Standalone instance with App Framework enabled and reset operator pod while app install is in progress", func() { /* Test Steps ################## SETUP #################### @@ -1399,7 +1399,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("integration, s1, appframeworksS1, appframework: Deploy a Standalone instance with App Framework enabled and reset operator pod while app download is in progress", func() { + It("integration, s1, testnewlabelforteardown, appframework: Deploy a Standalone instance with App Framework enabled and reset operator pod while app download is in progress", func() { /* Test Steps ################## SETUP #################### @@ -1467,7 +1467,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("integration, s1, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, install an app then disable it and remove it from app source", func() { + It("integration, s1, testnewlabelforteardown, appframework: can deploy a Standalone instance with App Framework enabled, install an app then disable it and remove it from app source", func() { /* Test Steps ################## SETUP #################### @@ -1561,7 +1561,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("integration, s1, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, attempt to update using incorrect S3 credentials", func() { + It("integration, s1, testnewlabelforteardown, appframework: can deploy a Standalone instance with App Framework enabled, attempt to update using incorrect S3 credentials", func() { /* Test Steps ################## SETUP #################### @@ -1698,7 +1698,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("integration, s1, appframeworksS1, appframework: Deploy a Standalone instance with App Framework enabled and update apps after app download is completed", func() { + It("integration, s1, testnewlabelforteardown, appframework: Deploy a Standalone instance with App Framework enabled and update apps after app download is completed", func() { /* Test Steps ################## SETUP #################### @@ -1782,7 +1782,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("integration, s1, appframeworksS1, appframework: can deploy a Standalone instance and install a bigger volume of apps than the operator PV disk space", func() { + It("integration, s1, testnewlabelforteardown, appframework: can deploy a Standalone instance and install a bigger volume of apps than the operator PV disk space", func() { /* Test Steps ################## SETUP #################### @@ -1857,7 +1857,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("integration, s1, appframeworksS1, appframework: Deploy a Standalone instance with App Framework enabled and delete apps from app directory when app download is complete", func() { + It("integration, s1, testnewlabelforteardown, appframework: Deploy a Standalone instance with App Framework enabled and delete apps from app directory when app download is complete", func() { /* Test Steps ################## SETUP #################### @@ -1928,7 +1928,7 @@ var _ = Describe("s1appfw test", func() { }) Context("Standalone deployment (S1) with App Framework", func() { - It("smoke, s1, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, install apps and check isDeploymentInProgress is set for Standaloen and MC CR's", func() { + It("smoke, s1, testnewlabelforteardown, appframework: can deploy a Standalone instance with App Framework enabled, install apps and check isDeploymentInProgress is set for Standaloen and MC CR's", func() { /* Test Steps ################## SETUP ####################