From cf80d91fa1424d8f13c4a70dc65bc40caff62fa9 Mon Sep 17 00:00:00 2001 From: Sarah Christoff <28318173+schristoff@users.noreply.github.com> Date: Sun, 4 Feb 2024 19:51:26 -0700 Subject: [PATCH 1/7] squash Signed-off-by: Sarah Christoff <28318173+schristoff@users.noreply.github.com> --- .../workflows/build-publish-from-fork.yaml | 36 ------- .../build_pipelinesrelease_template.yml | 19 ++-- .github/workflows/check-licenses.yaml | 2 +- .github/workflows/close-issues.yaml | 2 +- .github/workflows/codeql.yaml | 2 +- .../workflows/integ-reuseable-workflow.yml | 34 ++++++ .github/workflows/porter-integration.yml | 102 ++++++++++++++++-- .github/workflows/porter.yml | 6 ++ .github/workflows/trivy.yaml | 2 +- build/testdata/bundles/wordpress/.gitignore | 2 - build/testdata/bundles/wordpressv2/.gitignore | 0 tests/integration/archive_test.go | 1 - tests/integration/dependenciesv1_test.go | 1 - tests/integration/dependenciesv2_test.go | 2 +- 14 files changed, 149 insertions(+), 62 deletions(-) delete mode 100644 .github/workflows/build-publish-from-fork.yaml create mode 100644 .github/workflows/integ-reuseable-workflow.yml create mode 100644 build/testdata/bundles/wordpressv2/.gitignore diff --git a/.github/workflows/build-publish-from-fork.yaml b/.github/workflows/build-publish-from-fork.yaml deleted file mode 100644 index 7a2ff2b9f..000000000 --- a/.github/workflows/build-publish-from-fork.yaml +++ /dev/null @@ -1,36 +0,0 @@ -name: build-publish-from-fork -on: - workflow_dispatch: {} - push: {} - pull_request: {} - -jobs: - build: - runs-on: ubuntu-latest - if: github.repository != 'getporter/porter' - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Login to DockerHub - if: github.event_name != 'pull_request' - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ github.token }} - - uses: actions/setup-go@v3 - with: - go-version-file: go.mod - cache: true - cache-dependency-path: go.sum - - name: Set up Mage - run: go run mage.go EnsureMage - - name: Publish - if: ${{ github.event_name != 'pull_request' }} - env: - PORTER_REGISTRY: ghcr.io/${{ github.repository }} - run: | - mage -v XBuildAll - mage -v PublishServerMultiArchImages diff --git a/.github/workflows/build_pipelinesrelease_template.yml b/.github/workflows/build_pipelinesrelease_template.yml index c4cc138da..75efe45cd 100644 --- a/.github/workflows/build_pipelinesrelease_template.yml +++ b/.github/workflows/build_pipelinesrelease_template.yml @@ -92,7 +92,7 @@ jobs: shell: bash Validate-integration_test: env: - GHCR_IOGETPORTER_DOCKER_REGISTRY: https://ghcr.io + GHCR_IOGETPORTER_DOCKER_REGISTRY: ${{inputs.registry}} GHCR_IOGETPORTER_DOCKER_USERNAME: getporterbot name: Integration Test needs: @@ -140,7 +140,7 @@ jobs: run: go run mage.go ConfigureAgent UseXBuildBinaries - name: Run Smoke Tests run: mage -v TestSmoke - Publish-publish_binaries: + publish_binaries: name: Publish Binaries needs: - Validate-build @@ -168,10 +168,10 @@ jobs: env: GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" run: mage PublishPorter PublishMixins - Publish-publish_docker: + publish-ghcr: env: - DOCKER_REGISTRY: - DOCKER_USERNAME: + DOCKER_REGISTRY: https://ghcr.io + DOCKER_USERNAME: getporterbot name: Publish Docker Images needs: - Validate-build @@ -195,12 +195,11 @@ jobs: path: bin - name: Setup Bin run: go run mage.go ConfigureAgent UseXBuildBinaries - # Unable to determine registry '${{parameters.registry}}' type. The service connection was not found or the authentication type not supported. - - name: Docker Login + - name: Login to Container Registry uses: docker/login-action@v3.0.0 with: - registry: "${{ env.DOCKER_REGISTRY }}" - username: "${{ env.DOCKER_USERNAME }}" - password: "${{ secrets.DOCKER_PASSWORD }}" + registry: "${{inputs.registry}}" + username: "${{ github.actor }}" + password: "${{ secrets.GITHUB_TOKEN }}" - name: Publish Docker Images to ${{inputs.registry}} run: PORTER_REGISTRY=${{inputs.registry}} mage PublishImages diff --git a/.github/workflows/check-licenses.yaml b/.github/workflows/check-licenses.yaml index 99576c64f..9d306c380 100644 --- a/.github/workflows/check-licenses.yaml +++ b/.github/workflows/check-licenses.yaml @@ -14,7 +14,7 @@ jobs: with: fetch-depth: 0 - name: Set up Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: go-version-file: go.mod cache: true diff --git a/.github/workflows/close-issues.yaml b/.github/workflows/close-issues.yaml index 3487ea91b..ab373a242 100644 --- a/.github/workflows/close-issues.yaml +++ b/.github/workflows/close-issues.yaml @@ -14,6 +14,6 @@ jobs: runs-on: ubuntu-latest steps: - name: Closes issues related to a merged pull request. - uses: ldez/gha-mjolnir@v1.1.0 + uses: ldez/gha-mjolnir@v1.0.3 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml index 6b4fea43c..51c579f2b 100644 --- a/.github/workflows/codeql.yaml +++ b/.github/workflows/codeql.yaml @@ -21,7 +21,7 @@ jobs: with: fetch-depth: 0 # Get all git history - name: Set up Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: go-version-file: go.mod cache: true diff --git a/.github/workflows/integ-reuseable-workflow.yml b/.github/workflows/integ-reuseable-workflow.yml new file mode 100644 index 000000000..8da58d931 --- /dev/null +++ b/.github/workflows/integ-reuseable-workflow.yml @@ -0,0 +1,34 @@ +name: integ reusable workflow + +on: + workflow_call: + inputs: + test_name: + type: string + required: false +env: + GOVERSION: 1.20.7 + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: checkout + uses: actions/checkout@v4.1.0 + - uses: actions/setup-go@v4 + with: + go-version: "${{ env.GOVERSION }}" + cache: true + - name: Docker Login + uses: docker/login-action@v3.0.0 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Configure Agent + run: go run mage.go build + shell: bash + - name: Integration Test + run: go test -v -timeout=10m -tags=integration ./tests/integration/${{inputs.test_name}}.go + shell: bash + \ No newline at end of file diff --git a/.github/workflows/porter-integration.yml b/.github/workflows/porter-integration.yml index 7a177e2f3..36f7ece61 100644 --- a/.github/workflows/porter-integration.yml +++ b/.github/workflows/porter-integration.yml @@ -14,8 +14,88 @@ env: GOVERSION: 1.20.7 jobs: - Integration_test: - name: Integration Test + archive_integration_test: + uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + with: + test_name: archive_test + build_integration_test: + uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + with: + test_name: build_test + cli_integration_test: + uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + with: + test_name: cli_test + connection_nix_integration_test: + uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + with: + test_name: connection_nix_test + copy_integration_test: + uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + with: + test_name: copy_test + dependenciesv1_integration_test: + uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + with: + test_name: dependenciesv1_test + dependenciesv2_integration_test: + uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + with: + test_name: dependenciesv2_test + driver_integration_test: + uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + with: + test_name: driver_test + install_integration_test: + uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + with: + test_name: install_test + invoke_integration_test: + uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + with: + test_name: invoke_test + lint_integration_test: + uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + with: + test_name: lint_test + migration_integration_test: + uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + with: + test_name: migration_test + outputs_integration_test: + uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + with: + test_name: outputs_test + publish_integration_test: + uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + with: + test_name: publish_test + pull_integration_test: + uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + with: + test_name: pull_test + registry_integration_test: + uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + with: + test_name: registy_integration_test + schema_integration_test: + uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + with: + test_name: schema_test + sensitive_data_integration_test: + uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + with: + test_name: sensitive_data_test + suppress_output_integration_test: + uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + with: + test_name: suppress_output_test + telemetry_test: + uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + with: + test_name: telemetry_test + # Reusable workflows only supports 20 jobs + uninstall_test_integ: runs-on: ubuntu-latest steps: - name: checkout @@ -23,15 +103,23 @@ jobs: - uses: actions/setup-go@v4 with: go-version: "${{ env.GOVERSION }}" + cache: true + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Cache Docker layers + uses: actions/cache@v3 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ github.sha }} - name: Docker Login uses: docker/login-action@v3.0.0 with: - registry: ghcr.io + registry: ghcr.io/getporter username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Native Build - run: go run mage.go Build + - name: Configure Agent + run: go run mage.go build shell: bash - name: Integration Test - run: go run mage.go -v TestIntegration - shell: bash + run: go test -v -timeout=10m -tags=integration ./tests/integration/uninstall_test.go + shell: bash \ No newline at end of file diff --git a/.github/workflows/porter.yml b/.github/workflows/porter.yml index 348c73d3f..14472eefc 100644 --- a/.github/workflows/porter.yml +++ b/.github/workflows/porter.yml @@ -18,6 +18,7 @@ jobs: - uses: actions/setup-go@v4 with: go-version: "${{ env.GOVERSION }}" # The Go version to download (if necessary) and use. + cache: true - run: go version - name: Native Build run: go run mage.go build @@ -37,6 +38,7 @@ jobs: - uses: actions/setup-go@v4 with: go-version: "${{ env.GOVERSION }}" # The Go version to download (if necessary) and use. + cache: true - run: go version - name: Cross Compile run: go run mage.go -v XBuildAll @@ -56,6 +58,7 @@ jobs: - uses: actions/setup-go@v4 with: go-version: "${{ env.GOVERSION }}" # The Go version to download (if necessary) and use. + cache: true - run: go version - name: Unit Test run: go run mage.go -v TestUnit @@ -70,6 +73,7 @@ jobs: - uses: actions/setup-go@v4 with: go-version: "${{ env.GOVERSION }}" # The Go version to download (if necessary) and use. + cache: true - run: go version - name: Vet run: go run mage.go Vet @@ -90,6 +94,7 @@ jobs: - uses: actions/setup-go@v4 with: go-version: "${{ env.GOVERSION }}" # The Go version to download (if necessary) and use. + cache: true - run: go version - name: Download Cross-Compiled Porter Binaries uses: actions/download-artifact@v3.0.1 @@ -117,6 +122,7 @@ jobs: - uses: actions/setup-go@v4 with: go-version: "${{ env.GOVERSION }}" # The Go version to download (if necessary) and use. + cache: true - run: go version - name: Setup Bin run: go run mage.go UseXBuildBinaries diff --git a/.github/workflows/trivy.yaml b/.github/workflows/trivy.yaml index 05ac36e4a..d6c0fa8fb 100644 --- a/.github/workflows/trivy.yaml +++ b/.github/workflows/trivy.yaml @@ -21,7 +21,7 @@ jobs: with: fetch-depth: 0 # Get all git history - name: Set up Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: go-version-file: go.mod cache: true diff --git a/build/testdata/bundles/wordpress/.gitignore b/build/testdata/bundles/wordpress/.gitignore index ea5d8c03a..e69de29bb 100644 --- a/build/testdata/bundles/wordpress/.gitignore +++ b/build/testdata/bundles/wordpress/.gitignore @@ -1,2 +0,0 @@ -Dockerfile -.cnab diff --git a/build/testdata/bundles/wordpressv2/.gitignore b/build/testdata/bundles/wordpressv2/.gitignore new file mode 100644 index 000000000..e69de29bb diff --git a/tests/integration/archive_test.go b/tests/integration/archive_test.go index d6330e89f..608804fef 100644 --- a/tests/integration/archive_test.go +++ b/tests/integration/archive_test.go @@ -18,7 +18,6 @@ import ( // Validate that archiving a bundle twice results in the same digest func TestArchive_StableDigest(t *testing.T) { - t.Parallel() p := porter.NewTestPorter(t) defer p.Close() diff --git a/tests/integration/dependenciesv1_test.go b/tests/integration/dependenciesv1_test.go index d5065fa67..655b9bf4f 100644 --- a/tests/integration/dependenciesv1_test.go +++ b/tests/integration/dependenciesv1_test.go @@ -18,7 +18,6 @@ import ( ) func TestDependenciesLifecycle(t *testing.T) { - t.Parallel() p := porter.NewTestPorter(t) defer p.Close() diff --git a/tests/integration/dependenciesv2_test.go b/tests/integration/dependenciesv2_test.go index 328dcb4e8..ca4850b84 100644 --- a/tests/integration/dependenciesv2_test.go +++ b/tests/integration/dependenciesv2_test.go @@ -17,9 +17,9 @@ import ( ) func TestSharedDependencies(t *testing.T) { - t.Parallel() p := porter.NewTestPorter(t) + defer p.Close() ctx := p.SetupIntegrationTest() p.Config.SetExperimentalFlags(experimental.FlagDependenciesV2) From 0e6d636248bf43bff27505fd17d36dfcdf270c4e Mon Sep 17 00:00:00 2001 From: Sarah Christoff <28318173+schristoff@users.noreply.github.com> Date: Sun, 4 Feb 2024 21:47:09 -0700 Subject: [PATCH 2/7] add env var to be able to run single files through mage testinteg Signed-off-by: Sarah Christoff <28318173+schristoff@users.noreply.github.com> --- .github/workflows/integ-reuseable-workflow.yml | 3 ++- magefile.go | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integ-reuseable-workflow.yml b/.github/workflows/integ-reuseable-workflow.yml index 8da58d931..4248fe229 100644 --- a/.github/workflows/integ-reuseable-workflow.yml +++ b/.github/workflows/integ-reuseable-workflow.yml @@ -8,6 +8,7 @@ on: required: false env: GOVERSION: 1.20.7 + PORTER_INTEG_FILE: ${{inputs.test_name}}+.go jobs: build: @@ -29,6 +30,6 @@ jobs: run: go run mage.go build shell: bash - name: Integration Test - run: go test -v -timeout=10m -tags=integration ./tests/integration/${{inputs.test_name}}.go + run: go run mage.go -v TestIntegration shell: bash \ No newline at end of file diff --git a/magefile.go b/magefile.go index 039261c4d..eebe70c24 100644 --- a/magefile.go +++ b/magefile.go @@ -580,7 +580,15 @@ func TestIntegration() { verbose = "-v" } - must.Command("go", "test", verbose, "-timeout=30m", run, "-tags=integration", "./...").CollapseArgs().RunV() + var path string + filename := os.Getenv("PORTER_INTEG_FILE") + if filename == "" { + path = "./..." + } else { + path = "./tests/integration/" + filename + } + + must.Command("go", "test", verbose, "-timeout=30m", run, "-tags=integration", path).CollapseArgs().RunV() } func TestInitWarnings() { From 6ac318ce84fc14773823451f864e7e22e0d202ad Mon Sep 17 00:00:00 2001 From: Sarah Christoff <28318173+schristoff@users.noreply.github.com> Date: Sun, 4 Feb 2024 21:50:33 -0700 Subject: [PATCH 3/7] remove + Signed-off-by: Sarah Christoff <28318173+schristoff@users.noreply.github.com> --- .github/workflows/integ-reuseable-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integ-reuseable-workflow.yml b/.github/workflows/integ-reuseable-workflow.yml index 4248fe229..51a662354 100644 --- a/.github/workflows/integ-reuseable-workflow.yml +++ b/.github/workflows/integ-reuseable-workflow.yml @@ -8,7 +8,7 @@ on: required: false env: GOVERSION: 1.20.7 - PORTER_INTEG_FILE: ${{inputs.test_name}}+.go + PORTER_INTEG_FILE: ${{inputs.test_name}}.go jobs: build: From 714c88ccb79098e818706694f8eb202bd05350d9 Mon Sep 17 00:00:00 2001 From: Sarah Christoff <28318173+schristoff@users.noreply.github.com> Date: Sun, 4 Feb 2024 21:57:36 -0700 Subject: [PATCH 4/7] spell Signed-off-by: Sarah Christoff <28318173+schristoff@users.noreply.github.com> --- .github/workflows/porter-integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/porter-integration.yml b/.github/workflows/porter-integration.yml index 36f7ece61..860b94d61 100644 --- a/.github/workflows/porter-integration.yml +++ b/.github/workflows/porter-integration.yml @@ -77,7 +77,7 @@ jobs: registry_integration_test: uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables with: - test_name: registy_integration_test + test_name: registry_integration_test schema_integration_test: uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables with: From beee8eba22a9f250782120fba8ca2d34f3bdf682 Mon Sep 17 00:00:00 2001 From: Sarah Christoff <28318173+schristoff@users.noreply.github.com> Date: Sun, 4 Feb 2024 22:09:17 -0700 Subject: [PATCH 5/7] please dont turn off Signed-off-by: Sarah Christoff <28318173+schristoff@users.noreply.github.com> --- tests/integration/uninstall_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/integration/uninstall_test.go b/tests/integration/uninstall_test.go index 047368843..52f1a9102 100644 --- a/tests/integration/uninstall_test.go +++ b/tests/integration/uninstall_test.go @@ -5,6 +5,7 @@ package integration import ( "testing" + "get.porter.sh/porter/pkg/porter" "get.porter.sh/porter/tests" "get.porter.sh/porter/tests/testdata" "get.porter.sh/porter/tests/tester" @@ -12,6 +13,9 @@ import ( ) func TestUninstall_DeleteInstallation(t *testing.T) { + //Please don't shut yourself off + p := porter.NewTestPorter(t) + defer p.Close() test, err := tester.NewTest(t) defer test.Close() require.NoError(t, err, "test setup failed") From 11e03e3febb2faeecfca4e95306e9a898398eb29 Mon Sep 17 00:00:00 2001 From: Sarah Christoff <28318173+schristoff@users.noreply.github.com> Date: Sun, 4 Feb 2024 22:15:44 -0700 Subject: [PATCH 6/7] forgot about the last test not being in the workflow :( Signed-off-by: Sarah Christoff <28318173+schristoff@users.noreply.github.com> --- .github/workflows/integ-reuseable-workflow.yml | 7 +++++++ .github/workflows/porter-integration.yml | 6 ++++-- tests/integration/uninstall_test.go | 4 ---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/integ-reuseable-workflow.yml b/.github/workflows/integ-reuseable-workflow.yml index 51a662354..7b6ade90e 100644 --- a/.github/workflows/integ-reuseable-workflow.yml +++ b/.github/workflows/integ-reuseable-workflow.yml @@ -20,6 +20,13 @@ jobs: with: go-version: "${{ env.GOVERSION }}" cache: true + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Cache Docker layers + uses: actions/cache@v3 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ github.sha }} - name: Docker Login uses: docker/login-action@v3.0.0 with: diff --git a/.github/workflows/porter-integration.yml b/.github/workflows/porter-integration.yml index 860b94d61..368cd3fbe 100644 --- a/.github/workflows/porter-integration.yml +++ b/.github/workflows/porter-integration.yml @@ -114,12 +114,14 @@ jobs: - name: Docker Login uses: docker/login-action@v3.0.0 with: - registry: ghcr.io/getporter + registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Configure Agent run: go run mage.go build shell: bash - name: Integration Test - run: go test -v -timeout=10m -tags=integration ./tests/integration/uninstall_test.go + env: + PORTER_INTEG_FILE: uninstall_test.go + run: go run mage.go -v TestIntegration shell: bash \ No newline at end of file diff --git a/tests/integration/uninstall_test.go b/tests/integration/uninstall_test.go index 52f1a9102..047368843 100644 --- a/tests/integration/uninstall_test.go +++ b/tests/integration/uninstall_test.go @@ -5,7 +5,6 @@ package integration import ( "testing" - "get.porter.sh/porter/pkg/porter" "get.porter.sh/porter/tests" "get.porter.sh/porter/tests/testdata" "get.porter.sh/porter/tests/tester" @@ -13,9 +12,6 @@ import ( ) func TestUninstall_DeleteInstallation(t *testing.T) { - //Please don't shut yourself off - p := porter.NewTestPorter(t) - defer p.Close() test, err := tester.NewTest(t) defer test.Close() require.NoError(t, err, "test setup failed") From 898e8616bd9f0a7165edf3af635bfc42328675b5 Mon Sep 17 00:00:00 2001 From: Sarah Christoff <28318173+schristoff@users.noreply.github.com> Date: Sun, 4 Feb 2024 22:38:28 -0700 Subject: [PATCH 7/7] This will break everything Signed-off-by: Sarah Christoff <28318173+schristoff@users.noreply.github.com> --- .../build_pipelinesrelease_template.yml | 2 +- .github/workflows/close-issues.yaml | 4 +- .../workflows/integ-reuseable-workflow.yml | 1 - .github/workflows/porter-integration.yml | 46 +++++++++---------- tests/integration/archive_test.go | 2 +- tests/integration/dependenciesv1_test.go | 2 +- tests/integration/dependenciesv2_test.go | 2 +- 7 files changed, 27 insertions(+), 32 deletions(-) diff --git a/.github/workflows/build_pipelinesrelease_template.yml b/.github/workflows/build_pipelinesrelease_template.yml index 75efe45cd..30e9d9fbc 100644 --- a/.github/workflows/build_pipelinesrelease_template.yml +++ b/.github/workflows/build_pipelinesrelease_template.yml @@ -170,7 +170,7 @@ jobs: run: mage PublishPorter PublishMixins publish-ghcr: env: - DOCKER_REGISTRY: https://ghcr.io + DOCKER_REGISTRY: ${{inputs.registry}} DOCKER_USERNAME: getporterbot name: Publish Docker Images needs: diff --git a/.github/workflows/close-issues.yaml b/.github/workflows/close-issues.yaml index ab373a242..702fc94a7 100644 --- a/.github/workflows/close-issues.yaml +++ b/.github/workflows/close-issues.yaml @@ -10,10 +10,10 @@ on: - release/* jobs: - closeIssue: + closeIssueOnPrMergeTrigger: runs-on: ubuntu-latest steps: - name: Closes issues related to a merged pull request. uses: ldez/gha-mjolnir@v1.0.3 env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/integ-reuseable-workflow.yml b/.github/workflows/integ-reuseable-workflow.yml index 7b6ade90e..d78be7787 100644 --- a/.github/workflows/integ-reuseable-workflow.yml +++ b/.github/workflows/integ-reuseable-workflow.yml @@ -39,4 +39,3 @@ jobs: - name: Integration Test run: go run mage.go -v TestIntegration shell: bash - \ No newline at end of file diff --git a/.github/workflows/porter-integration.yml b/.github/workflows/porter-integration.yml index 368cd3fbe..041172e44 100644 --- a/.github/workflows/porter-integration.yml +++ b/.github/workflows/porter-integration.yml @@ -1,8 +1,4 @@ name: porter/porter-integration -# this will only run when this is on main branch apparently so use pr for now (temporary) -#on: -# issue_comment: -# types: [created, edited] on: pull_request: branches: @@ -15,83 +11,83 @@ env: jobs: archive_integration_test: - uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: archive_test build_integration_test: - uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: build_test cli_integration_test: - uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: cli_test connection_nix_integration_test: - uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: connection_nix_test copy_integration_test: - uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: copy_test dependenciesv1_integration_test: - uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: dependenciesv1_test dependenciesv2_integration_test: - uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: dependenciesv2_test driver_integration_test: - uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: driver_test install_integration_test: - uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: install_test invoke_integration_test: - uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: invoke_test lint_integration_test: - uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: lint_test migration_integration_test: - uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: migration_test outputs_integration_test: - uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: outputs_test publish_integration_test: - uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: publish_test pull_integration_test: - uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: pull_test registry_integration_test: - uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: registry_integration_test schema_integration_test: - uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: schema_test sensitive_data_integration_test: - uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: sensitive_data_test suppress_output_integration_test: - uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: suppress_output_test telemetry_test: - uses: schristoff/porter/.github/workflows/integ-reuseable-workflow.yml@schristoff_ghavariables + uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: telemetry_test # Reusable workflows only supports 20 jobs @@ -124,4 +120,4 @@ jobs: env: PORTER_INTEG_FILE: uninstall_test.go run: go run mage.go -v TestIntegration - shell: bash \ No newline at end of file + shell: bash diff --git a/tests/integration/archive_test.go b/tests/integration/archive_test.go index 608804fef..f3b03f5c9 100644 --- a/tests/integration/archive_test.go +++ b/tests/integration/archive_test.go @@ -18,7 +18,7 @@ import ( // Validate that archiving a bundle twice results in the same digest func TestArchive_StableDigest(t *testing.T) { - + t.Parallel() p := porter.NewTestPorter(t) defer p.Close() ctx := p.SetupIntegrationTest() diff --git a/tests/integration/dependenciesv1_test.go b/tests/integration/dependenciesv1_test.go index 655b9bf4f..2732bf987 100644 --- a/tests/integration/dependenciesv1_test.go +++ b/tests/integration/dependenciesv1_test.go @@ -18,7 +18,7 @@ import ( ) func TestDependenciesLifecycle(t *testing.T) { - + t.Parallel() p := porter.NewTestPorter(t) defer p.Close() ctx := p.SetupIntegrationTest() diff --git a/tests/integration/dependenciesv2_test.go b/tests/integration/dependenciesv2_test.go index ca4850b84..cb0ada7d2 100644 --- a/tests/integration/dependenciesv2_test.go +++ b/tests/integration/dependenciesv2_test.go @@ -17,7 +17,7 @@ import ( ) func TestSharedDependencies(t *testing.T) { - + t.Parallel() p := porter.NewTestPorter(t) defer p.Close() ctx := p.SetupIntegrationTest()