From 53a5dbdad502abde0206c37d6a7fa68bb23de332 Mon Sep 17 00:00:00 2001 From: Shwetha Gururaj Date: Tue, 5 Mar 2024 14:16:46 -0500 Subject: [PATCH 01/10] Update CLI to use ginkgo v2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add user agent info for plugin api calls - Newer lager was needed with newer diego-ssh * Replace depracted ginkgo calls with non deprecated calls * Remove ACK_GINKGO_RC * Desperate attempt at resolving output issue by using serial decorator and using non deprecated pty * Turn off Gingkno v2 parallel mode * Adjust integration tests to use ginkgo v2 * Add Byte to lograte, disk and memory regexes used by int tests --------- Co-authored-by: M. Oleske Co-authored-by: Al Berez Co-authored-by: Cristhian Peña Co-authored-by: Marc Paquette --- .github/workflows/tests-integration-reusable.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests-integration-reusable.yml b/.github/workflows/tests-integration-reusable.yml index 856e88ee58..ba7758ebac 100644 --- a/.github/workflows/tests-integration-reusable.yml +++ b/.github/workflows/tests-integration-reusable.yml @@ -32,7 +32,7 @@ jobs: runs-on: ${{ inputs.os }} steps: - - uses: LouisBrunner/checks-action@v2.0.0 + - uses: LouisBrunner/checks-action@v1.6.2 if: always() id: check with: @@ -301,7 +301,7 @@ jobs: grep -q -E "HTTP/[[:digit:]\.]{1,3} 404" headers.txt && echo $(echo "$output" | jq '.messages | join(", ")') && exit 2 grep -q -E "HTTP/[[:digit:]\.]{1,3} 202" headers.txt && break done - - uses: LouisBrunner/checks-action@v2.0.0 + - uses: LouisBrunner/checks-action@v1.6.2 if: always() with: token: ${{ secrets.GITHUB_TOKEN }} From 0c86f6ca05d388c3570ba264e1129ae17ce4cae9 Mon Sep 17 00:00:00 2001 From: Shwetha Gururaj Date: Tue, 5 Mar 2024 14:29:40 -0500 Subject: [PATCH 02/10] run v8 --- .github/workflows/tests-integration.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tests-integration.yml b/.github/workflows/tests-integration.yml index 270e87cd38..1ddb190112 100644 --- a/.github/workflows/tests-integration.yml +++ b/.github/workflows/tests-integration.yml @@ -1,19 +1,22 @@ name: "Tests: Integration" -run-name: "Integration [${{ github.event.workflow_run.head_branch }}]: ${{ github.event.workflow_run.head_commit.message }}" +# run-name: "Integration [${{ github.event.workflow_run.head_branch }}]: ${{ github.event.workflow_run.head_commit.message }}" on: workflow_dispatch: + push: + branches: + - v8 workflow_run: - workflows: - - "Tests" - types: - - completed + # workflows: + # - "Tests" + # types: + # - completed jobs: run-integration-tests-cf-env: name: Integration tests - if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }} + # if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }} uses: ./.github/workflows/tests-integration-reusable.yml with: capi-version: edge @@ -24,7 +27,7 @@ jobs: run-integration-tests-cf-env-with-client-creds: name: client creds - if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }} + # if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }} uses: ./.github/workflows/tests-integration-reusable.yml with: capi-version: edge @@ -35,7 +38,7 @@ jobs: run-integration-tests-cf-env-with-min-capi: name: MIN CAPI - if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }} + # if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }} uses: ./.github/workflows/tests-integration-reusable.yml with: capi-version: min From cf762300837d3f7bf4e702a426855a3d664073f9 Mon Sep 17 00:00:00 2001 From: Shwetha Gururaj Date: Tue, 5 Mar 2024 14:32:43 -0500 Subject: [PATCH 03/10] Fix syntax --- .github/workflows/tests-integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests-integration.yml b/.github/workflows/tests-integration.yml index 1ddb190112..ea2cb5df1e 100644 --- a/.github/workflows/tests-integration.yml +++ b/.github/workflows/tests-integration.yml @@ -4,10 +4,10 @@ name: "Tests: Integration" on: workflow_dispatch: + workflow_run: push: branches: - v8 - workflow_run: # workflows: # - "Tests" # types: From 05dfdc068984acf7de212490a4cf5a24219c21db Mon Sep 17 00:00:00 2001 From: Shwetha Gururaj Date: Tue, 5 Mar 2024 14:33:46 -0500 Subject: [PATCH 04/10] Remove on workflow run --- .github/workflows/tests-integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests-integration.yml b/.github/workflows/tests-integration.yml index ea2cb5df1e..ba850128a0 100644 --- a/.github/workflows/tests-integration.yml +++ b/.github/workflows/tests-integration.yml @@ -4,10 +4,10 @@ name: "Tests: Integration" on: workflow_dispatch: - workflow_run: push: branches: - v8 + # workflow_run: # workflows: # - "Tests" # types: From d9e31887e9283b0231e1f548c88013695e019184 Mon Sep 17 00:00:00 2001 From: Shwetha Gururaj Date: Tue, 5 Mar 2024 14:34:51 -0500 Subject: [PATCH 05/10] Remove PR Check --- .../workflows/tests-integration-reusable.yml | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/tests-integration-reusable.yml b/.github/workflows/tests-integration-reusable.yml index ba7758ebac..7e195ca399 100644 --- a/.github/workflows/tests-integration-reusable.yml +++ b/.github/workflows/tests-integration-reusable.yml @@ -32,16 +32,16 @@ jobs: runs-on: ${{ inputs.os }} steps: - - uses: LouisBrunner/checks-action@v1.6.2 - if: always() - id: check - with: - token: ${{ secrets.GITHUB_TOKEN }} - name: "${{ inputs.name }}" - status: in_progress - sha: ${{github.event.workflow_run.head_sha}} - output: | - {"title": "${{ inputs.name }}", "summary":"started ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"} + # - uses: LouisBrunner/checks-action@v1.6.2 + # if: always() + # id: check + # with: + # token: ${{ secrets.GITHUB_TOKEN }} + # name: "${{ inputs.name }}" + # status: in_progress + # sha: ${{github.event.workflow_run.head_sha}} + # output: | + # {"title": "${{ inputs.name }}", "summary":"started ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"} - name: Checkout cli uses: actions/checkout@v4 with: @@ -301,12 +301,12 @@ jobs: grep -q -E "HTTP/[[:digit:]\.]{1,3} 404" headers.txt && echo $(echo "$output" | jq '.messages | join(", ")') && exit 2 grep -q -E "HTTP/[[:digit:]\.]{1,3} 202" headers.txt && break done - - uses: LouisBrunner/checks-action@v1.6.2 - if: always() - with: - token: ${{ secrets.GITHUB_TOKEN }} - check_id: ${{ steps.check.outputs.check_id }} - conclusion: ${{ job.status }} - sha: ${{github.event.workflow_run.head_sha}} - output: | - {"title": "${{ inputs.name }}", "summary":"finished ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"} + # - uses: LouisBrunner/checks-action@v1.6.2 + # if: always() + # with: + # token: ${{ secrets.GITHUB_TOKEN }} + # check_id: ${{ steps.check.outputs.check_id }} + # conclusion: ${{ job.status }} + # sha: ${{github.event.workflow_run.head_sha}} + # output: | + # {"title": "${{ inputs.name }}", "summary":"finished ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"} From 268cf52215f80a40686830d013b179a770690f46 Mon Sep 17 00:00:00 2001 From: Shwetha Gururaj Date: Tue, 5 Mar 2024 16:56:51 -0500 Subject: [PATCH 06/10] Revert workflow changes --- .../workflows/tests-integration-reusable.yml | 38 +++++++++---------- .github/workflows/tests-integration.yml | 21 +++++----- 2 files changed, 28 insertions(+), 31 deletions(-) diff --git a/.github/workflows/tests-integration-reusable.yml b/.github/workflows/tests-integration-reusable.yml index 7e195ca399..ba7758ebac 100644 --- a/.github/workflows/tests-integration-reusable.yml +++ b/.github/workflows/tests-integration-reusable.yml @@ -32,16 +32,16 @@ jobs: runs-on: ${{ inputs.os }} steps: - # - uses: LouisBrunner/checks-action@v1.6.2 - # if: always() - # id: check - # with: - # token: ${{ secrets.GITHUB_TOKEN }} - # name: "${{ inputs.name }}" - # status: in_progress - # sha: ${{github.event.workflow_run.head_sha}} - # output: | - # {"title": "${{ inputs.name }}", "summary":"started ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"} + - uses: LouisBrunner/checks-action@v1.6.2 + if: always() + id: check + with: + token: ${{ secrets.GITHUB_TOKEN }} + name: "${{ inputs.name }}" + status: in_progress + sha: ${{github.event.workflow_run.head_sha}} + output: | + {"title": "${{ inputs.name }}", "summary":"started ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"} - name: Checkout cli uses: actions/checkout@v4 with: @@ -301,12 +301,12 @@ jobs: grep -q -E "HTTP/[[:digit:]\.]{1,3} 404" headers.txt && echo $(echo "$output" | jq '.messages | join(", ")') && exit 2 grep -q -E "HTTP/[[:digit:]\.]{1,3} 202" headers.txt && break done - # - uses: LouisBrunner/checks-action@v1.6.2 - # if: always() - # with: - # token: ${{ secrets.GITHUB_TOKEN }} - # check_id: ${{ steps.check.outputs.check_id }} - # conclusion: ${{ job.status }} - # sha: ${{github.event.workflow_run.head_sha}} - # output: | - # {"title": "${{ inputs.name }}", "summary":"finished ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"} + - uses: LouisBrunner/checks-action@v1.6.2 + if: always() + with: + token: ${{ secrets.GITHUB_TOKEN }} + check_id: ${{ steps.check.outputs.check_id }} + conclusion: ${{ job.status }} + sha: ${{github.event.workflow_run.head_sha}} + output: | + {"title": "${{ inputs.name }}", "summary":"finished ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"} diff --git a/.github/workflows/tests-integration.yml b/.github/workflows/tests-integration.yml index ba850128a0..270e87cd38 100644 --- a/.github/workflows/tests-integration.yml +++ b/.github/workflows/tests-integration.yml @@ -1,22 +1,19 @@ name: "Tests: Integration" -# run-name: "Integration [${{ github.event.workflow_run.head_branch }}]: ${{ github.event.workflow_run.head_commit.message }}" +run-name: "Integration [${{ github.event.workflow_run.head_branch }}]: ${{ github.event.workflow_run.head_commit.message }}" on: workflow_dispatch: - push: - branches: - - v8 - # workflow_run: - # workflows: - # - "Tests" - # types: - # - completed + workflow_run: + workflows: + - "Tests" + types: + - completed jobs: run-integration-tests-cf-env: name: Integration tests - # if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }} + if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }} uses: ./.github/workflows/tests-integration-reusable.yml with: capi-version: edge @@ -27,7 +24,7 @@ jobs: run-integration-tests-cf-env-with-client-creds: name: client creds - # if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }} + if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }} uses: ./.github/workflows/tests-integration-reusable.yml with: capi-version: edge @@ -38,7 +35,7 @@ jobs: run-integration-tests-cf-env-with-min-capi: name: MIN CAPI - # if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }} + if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }} uses: ./.github/workflows/tests-integration-reusable.yml with: capi-version: min From 1d8c33f6ada4fc68780a296fc6b50cbbd616ecb8 Mon Sep 17 00:00:00 2001 From: Shwetha Gururaj Date: Tue, 12 Mar 2024 11:00:45 -0400 Subject: [PATCH 07/10] Update checks-action version --- .github/workflows/tests-integration-reusable.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests-integration-reusable.yml b/.github/workflows/tests-integration-reusable.yml index ba7758ebac..856e88ee58 100644 --- a/.github/workflows/tests-integration-reusable.yml +++ b/.github/workflows/tests-integration-reusable.yml @@ -32,7 +32,7 @@ jobs: runs-on: ${{ inputs.os }} steps: - - uses: LouisBrunner/checks-action@v1.6.2 + - uses: LouisBrunner/checks-action@v2.0.0 if: always() id: check with: @@ -301,7 +301,7 @@ jobs: grep -q -E "HTTP/[[:digit:]\.]{1,3} 404" headers.txt && echo $(echo "$output" | jq '.messages | join(", ")') && exit 2 grep -q -E "HTTP/[[:digit:]\.]{1,3} 202" headers.txt && break done - - uses: LouisBrunner/checks-action@v1.6.2 + - uses: LouisBrunner/checks-action@v2.0.0 if: always() with: token: ${{ secrets.GITHUB_TOKEN }} From ce31efa1f7377e5c2ea283ecaa8f99c61b3757ee Mon Sep 17 00:00:00 2001 From: Al Berez Date: Fri, 22 Mar 2024 12:44:59 -0700 Subject: [PATCH 08/10] Fix go.mod gomega When we ran Ginkgo v2 tests for the first time we got the following error: ``` go install github.com/onsi/ginkgo/v2/ginkgo go install github.com/onsi/gomega/matchers shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0} go: downloading github.com/onsi/ginkgo/v2 v2.15.0 go: downloading github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 go: downloading golang.org/x/tools v0.17.0 go: downloading github.com/google/pprof v0.0.0-20230912144702-c363fe2c2ed8 missing go.sum entry for module providing package github.com/onsi/gomega/matchers; to add: go mod download github.com/onsi/gomega Error: Process completed with exit code 1. ``` --- go.sum | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go.sum b/go.sum index 2cc8b5a388..c00c7e28b7 100644 --- a/go.sum +++ b/go.sum @@ -208,8 +208,8 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= github.com/onsi/gomega v1.20.0/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo= -github.com/onsi/gomega v1.31.1 h1:KYppCUK+bUgAZwHOu7EXVBKyQA6ILvOESHkn/tgoqvo= -github.com/onsi/gomega v1.31.1/go.mod h1:y40C95dwAD1Nz36SsEnxvfFe8FFfNxzI5eJ0EYGyAy0= +github.com/onsi/gomega v1.32.0 h1:JRYU78fJ1LPxlckP6Txi/EYqJvjtMrDC04/MM5XRHPk= +github.com/onsi/gomega v1.32.0/go.mod h1:a4x4gW6Pz2yK1MAmvluYme5lvYTn61afQ2ETw/8n4Lg= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/openzipkin/zipkin-go v0.4.2 h1:zjqfqHjUpPmB3c1GlCvvgsM1G4LkvqQbBDueDOCg/jA= From 8d663d2000522bc441d79f18e5fce517c8489315 Mon Sep 17 00:00:00 2001 From: Shwetha Gururaj Date: Wed, 27 Mar 2024 12:14:58 -0400 Subject: [PATCH 09/10] Ginkgo v2 additional changes (#2832) Update deprecated v1 calls to use v2 --- .../shared/experimental/experimental_suite_test.go | 8 ++++---- integration/shared/global/global_suite_test.go | 6 +++--- integration/shared/performance/performance_suite_test.go | 8 ++++---- integration/v7/global/global_suite_test.go | 6 +++--- integration/v7/isolated/app_command_test.go | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/integration/shared/experimental/experimental_suite_test.go b/integration/shared/experimental/experimental_suite_test.go index fb60b700c1..4e819c02d3 100644 --- a/integration/shared/experimental/experimental_suite_test.go +++ b/integration/shared/experimental/experimental_suite_test.go @@ -43,7 +43,7 @@ var _ = SynchronizedBeforeSuite(func() []byte { return nil }, func(_ []byte) { - GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized Before Each==============================", GinkgoParallelNode()))) + GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized Before Each==============================", GinkgoParallelProcess()))) // Ginkgo Globals SetDefaultEventuallyTimeout(CFEventuallyTimeout) SetDefaultConsistentlyDuration(CFConsistentlyTimeout) @@ -54,16 +54,16 @@ var _ = SynchronizedBeforeSuite(func() []byte { // Enable Experimental Flag helpers.TurnOnExperimental() - GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized Before Each==============================", GinkgoParallelNode()))) + GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized Before Each==============================", GinkgoParallelProcess()))) }) var _ = SynchronizedAfterSuite(func() { - GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized After Each==============================", GinkgoParallelNode()))) + GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized After Each==============================", GinkgoParallelProcess()))) suiteHomeDir := helpers.SetHomeDir() helpers.SetAPI() helpers.LoginCF() helpers.DestroyHomeDir(suiteHomeDir) - GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized After Each==============================", GinkgoParallelNode()))) + GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized After Each==============================", GinkgoParallelProcess()))) }, func() {}) var _ = BeforeEach(func() { diff --git a/integration/shared/global/global_suite_test.go b/integration/shared/global/global_suite_test.go index 04e8be3c60..487d0db8e4 100644 --- a/integration/shared/global/global_suite_test.go +++ b/integration/shared/global/global_suite_test.go @@ -48,11 +48,11 @@ var _ = SynchronizedBeforeSuite(func() []byte { GinkgoWriter.Write([]byte("==============================End of Global FIRST Node Synchronized Before Each==============================")) return nil }, func(_ []byte) { - GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized Before Each==============================", GinkgoParallelNode()))) - if GinkgoParallelNode() != 1 { + GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized Before Each==============================", GinkgoParallelProcess()))) + if GinkgoParallelProcess() != 1 { Fail("Test suite cannot run in parallel") } - GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized Before Each==============================", GinkgoParallelNode()))) + GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized Before Each==============================", GinkgoParallelProcess()))) }) var _ = BeforeEach(func() { diff --git a/integration/shared/performance/performance_suite_test.go b/integration/shared/performance/performance_suite_test.go index a32dce35ab..f9b0cad508 100644 --- a/integration/shared/performance/performance_suite_test.go +++ b/integration/shared/performance/performance_suite_test.go @@ -39,7 +39,7 @@ var _ = SynchronizedBeforeSuite(func() []byte { return nil }, func(_ []byte) { - GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized Before Each==============================", GinkgoParallelNode()))) + GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized Before Each==============================", GinkgoParallelProcess()))) // Ginkgo Globals SetDefaultEventuallyTimeout(CFEventuallyTimeout) SetDefaultConsistentlyDuration(CFConsistentlyTimeout) @@ -48,17 +48,17 @@ var _ = SynchronizedBeforeSuite(func() []byte { helpers.TurnOffColors() perfOrg, perfSpace = helpers.SetupReadOnlyOrgAndSpace() - GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized Before Each==============================", GinkgoParallelNode()))) + GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized Before Each==============================", GinkgoParallelProcess()))) }) var _ = SynchronizedAfterSuite(func() { - GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized After Each==============================", GinkgoParallelNode()))) + GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized After Each==============================", GinkgoParallelProcess()))) homeDir = helpers.SetHomeDir() helpers.SetAPI() helpers.LoginCF() helpers.QuickDeleteOrg(perfOrg) helpers.DestroyHomeDir(homeDir) - GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized After Each==============================", GinkgoParallelNode()))) + GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized After Each==============================", GinkgoParallelProcess()))) }, func() {}) var _ = BeforeEach(func() { diff --git a/integration/v7/global/global_suite_test.go b/integration/v7/global/global_suite_test.go index 04e8be3c60..487d0db8e4 100644 --- a/integration/v7/global/global_suite_test.go +++ b/integration/v7/global/global_suite_test.go @@ -48,11 +48,11 @@ var _ = SynchronizedBeforeSuite(func() []byte { GinkgoWriter.Write([]byte("==============================End of Global FIRST Node Synchronized Before Each==============================")) return nil }, func(_ []byte) { - GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized Before Each==============================", GinkgoParallelNode()))) - if GinkgoParallelNode() != 1 { + GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized Before Each==============================", GinkgoParallelProcess()))) + if GinkgoParallelProcess() != 1 { Fail("Test suite cannot run in parallel") } - GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized Before Each==============================", GinkgoParallelNode()))) + GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized Before Each==============================", GinkgoParallelProcess()))) }) var _ = BeforeEach(func() { diff --git a/integration/v7/isolated/app_command_test.go b/integration/v7/isolated/app_command_test.go index e0489918a7..1be56f2fd7 100644 --- a/integration/v7/isolated/app_command_test.go +++ b/integration/v7/isolated/app_command_test.go @@ -348,7 +348,7 @@ applications: BeforeEach(func() { tcpDomain = helpers.NewDomain(orgName, helpers.NewDomainName("tcp")) - tcpDomain.CreateWithRouterGroup(helpers.FindOrCreateTCPRouterGroup(GinkgoParallelNode())) + tcpDomain.CreateWithRouterGroup(helpers.FindOrCreateTCPRouterGroup(GinkgoParallelProcess())) helpers.WithHelloWorldApp(func(appDir string) { manifestContents := []byte(fmt.Sprintf(` --- From 260481681224d666599b0a7ef2e1857b8f05b28f Mon Sep 17 00:00:00 2001 From: Shwetha Gururaj Date: Wed, 27 Mar 2024 15:04:40 -0400 Subject: [PATCH 10/10] fix dependencies --- go.sum | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go.sum b/go.sum index c00c7e28b7..2cc8b5a388 100644 --- a/go.sum +++ b/go.sum @@ -208,8 +208,8 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= github.com/onsi/gomega v1.20.0/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo= -github.com/onsi/gomega v1.32.0 h1:JRYU78fJ1LPxlckP6Txi/EYqJvjtMrDC04/MM5XRHPk= -github.com/onsi/gomega v1.32.0/go.mod h1:a4x4gW6Pz2yK1MAmvluYme5lvYTn61afQ2ETw/8n4Lg= +github.com/onsi/gomega v1.31.1 h1:KYppCUK+bUgAZwHOu7EXVBKyQA6ILvOESHkn/tgoqvo= +github.com/onsi/gomega v1.31.1/go.mod h1:y40C95dwAD1Nz36SsEnxvfFe8FFfNxzI5eJ0EYGyAy0= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/openzipkin/zipkin-go v0.4.2 h1:zjqfqHjUpPmB3c1GlCvvgsM1G4LkvqQbBDueDOCg/jA=