From 546d729758a023054e770058a6c9e8fb1915db89 Mon Sep 17 00:00:00 2001 From: Julien Poissonnier Date: Fri, 26 Jul 2024 14:10:37 +0200 Subject: [PATCH] Update settings for use on fork --- .github/workflows/ci.yml | 36 +++++++++++++++++++---------------- .github/workflows/release.yml | 36 ++++++++++++++++++++--------------- tests/containers_test.go | 4 ++-- 3 files changed, 43 insertions(+), 33 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 764c0d87..1f16969b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,11 +25,11 @@ env: PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} # Used by test-containers.sh\ # The organization in the Pulumi SaaS service against which the integration # tests will run: - PULUMI_ORG: "pulumi-test" + PULUMI_ORG: "v-julien-pulumi-corp" # We parameterize the Docker Hub username to allow forks to easily test # changes on a separate repo without having to change the username in multiple # places: - DOCKER_USERNAME: pulumi + DOCKER_USERNAME: jpoissonnier PULUMI_VERSION: ${{ github.event.inputs.pulumi_version || github.event.client_payload.ref }} # Do not depend on C library for the tests. CGO_ENABLED: "0" @@ -60,6 +60,7 @@ jobs: [1]: ${{ steps.vars.outputs.run-url }} kitchen-sink: name: All SDKs image + if: false strategy: matrix: go-version: [1.21.x] @@ -104,9 +105,9 @@ jobs: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: ${{ env.AWS_REGION }} - role-duration-seconds: 14400 # 4 hours - role-session-name: pulumi-docker-containers@githubActions - role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }} + # role-duration-seconds: 14400 # 4 hours + # role-session-name: pulumi-docker-containers@githubActions + # role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }} - name: Run Pulumi Template Tests run: | docker run \ @@ -147,6 +148,7 @@ jobs: provider-build-environment: name: Provider Build Environment image + if: false strategy: matrix: go-version: [1.21.x] @@ -191,9 +193,9 @@ jobs: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: ${{ env.AWS_REGION }} - role-duration-seconds: 14400 # 4 hours - role-session-name: pulumi-docker-containers@githubActions - role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }} + # role-duration-seconds: 14400 # 4 hours + # role-session-name: pulumi-docker-containers@githubActions + # role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }} - name: Run Pulumi Template Tests run: | docker run \ @@ -215,6 +217,7 @@ jobs: base: name: Base image + if: false runs-on: ubuntu-latest strategy: fail-fast: false @@ -248,8 +251,8 @@ jobs: strategy: fail-fast: false matrix: - sdk: ["nodejs", "python", "dotnet", "go", "java"] - arch: ["amd64", "arm64"] + sdk: ["nodejs"] #, "python", "dotnet", "go", "java"] + arch: ["amd64"] #, "arm64"] steps: # If no version of Pulumi is supplied by the incoming event (e.g. in the # case of a PR or merge to main), we use the latest production version: @@ -298,9 +301,9 @@ jobs: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: ${{ env.AWS_REGION }} - role-duration-seconds: 14400 # 4 hours - role-session-name: pulumi-docker-containers@githubActions - role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }} + # role-duration-seconds: 14400 # 4 hours + # role-session-name: pulumi-docker-containers@githubActions + # role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }} - name: Run Pulumi Template Tests run: | docker run \ @@ -324,6 +327,7 @@ jobs: ubi-sdk: name: UBI SDK images + if: false runs-on: ubuntu-latest strategy: fail-fast: false @@ -381,9 +385,9 @@ jobs: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: ${{ env.AWS_REGION }} - role-duration-seconds: 14400 # 4 hours - role-session-name: pulumi-docker-containers@githubActions - role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }} + # role-duration-seconds: 14400 # 4 hours + # role-session-name: pulumi-docker-containers@githubActions + # role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }} - name: Run Pulumi Template Tests run: | docker run \ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0a1754c3..6940db62 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,12 +31,12 @@ env: PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} # The organization in the Pulumi SaaS service against which the integration # tests will run: - PULUMI_ORG: "pulumi-test" + PULUMI_ORG: "v-julien-pulumi-corp" # We parameterize the Docker Hub username to allow forks to easily test # changes on a separate repo without having to change the username in multiple # places: - DOCKER_USERNAME: pulumibot - DOCKER_ORG: pulumi + DOCKER_USERNAME: jpoissonnier + DOCKER_ORG: jpoissonnier PULUMI_VERSION: ${{ github.event.inputs.pulumi_version || github.event.client_payload.ref }} # Do not depend on C library for the tests. CGO_ENABLED: "0" @@ -50,6 +50,7 @@ env: jobs: kitchen-sink: name: All SDKs image + if: false strategy: matrix: go-version: [1.21.x] @@ -94,9 +95,9 @@ jobs: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: ${{ env.AWS_REGION }} - role-duration-seconds: 14400 # 4 hours - role-session-name: pulumi-docker-containers@githubActions - role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }} + # role-duration-seconds: 14400 # 4 hours + # role-session-name: pulumi-docker-containers@githubActions + # role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }} - name: Run Pulumi Template Tests run: | docker run \ @@ -142,6 +143,7 @@ jobs: provider-build-environment: name: Provider Build Environment image + if: false strategy: matrix: go-version: [1.21.1] @@ -186,9 +188,9 @@ jobs: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: ${{ env.AWS_REGION }} - role-duration-seconds: 14400 # 4 hours - role-session-name: pulumi-docker-containers@githubActions - role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }} + # role-duration-seconds: 14400 # 4 hours + # role-session-name: pulumi-docker-containers@githubActions + # role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }} - name: Run Pulumi Template Tests run: | docker run \ @@ -215,6 +217,7 @@ jobs: base: name: Base image + if: false runs-on: ubuntu-latest strategy: fail-fast: false @@ -247,6 +250,7 @@ jobs: run: | docker push ${{ env.DOCKER_ORG }}/pulumi-base:${{ env.PULUMI_VERSION }}-${{ matrix.os}}-${{ matrix.arch }} base-manifests: + if: false name: Base image manifests needs: ["base"] runs-on: ubuntu-latest @@ -293,7 +297,7 @@ jobs: strategy: fail-fast: false matrix: - sdk: ["nodejs", "python", "dotnet", "go", "java"] + sdk: ["nodejs"] #, "python", "dotnet", "go", "java"] arch: ["amd64", "arm64"] steps: - uses: actions/checkout@master @@ -343,9 +347,9 @@ jobs: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: ${{ env.AWS_REGION }} - role-duration-seconds: 14400 # 4 hours - role-session-name: pulumi-docker-containers@githubActions - role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }} + # role-duration-seconds: 14400 # 4 hours + # role-session-name: pulumi-docker-containers@githubActions + # role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }} - name: Run Pulumi Template Tests run: | docker run \ @@ -376,7 +380,7 @@ jobs: strategy: fail-fast: false matrix: - sdk: ["nodejs", "python", "dotnet", "go", "java"] + sdk: ["nodejs"] #, "python", "dotnet", "go", "java"] steps: - name: Login to Docker Hub uses: docker/login-action@v1 @@ -410,6 +414,7 @@ jobs: ubi-sdk: name: UBI SDK images + if: false runs-on: ubuntu-latest strategy: fail-fast: false @@ -501,7 +506,8 @@ jobs: # accept arbitrary parameters, as we would need to persist the tag_latest # option from a workflow_dispatch in this workflow to each of the sync # workflows. - if: ${{ github.event.inputs.force_release || github.event_name == 'repository_dispatch' }} + # if: ${{ github.event.inputs.force_release || github.event_name == 'repository_dispatch' }} + if: false steps: - name: Install Pulumictl uses: jaxxstorm/action-install-gh-release@v1.2.0 diff --git a/tests/containers_test.go b/tests/containers_test.go index 8111dd99..98b58ba7 100644 --- a/tests/containers_test.go +++ b/tests/containers_test.go @@ -48,7 +48,7 @@ func TestPulumiTemplateTests(t *testing.T) { // AWS mustEnv(t, "AWS_ACCESS_KEY_ID") mustEnv(t, "AWS_SECRET_ACCESS_KEY") - mustEnv(t, "AWS_SESSION_TOKEN") + // mustEnv(t, "AWS_SESSION_TOKEN") stackOwner := mustEnv(t, "PULUMI_ORG") @@ -146,7 +146,7 @@ func TestCLIToolTests(t *testing.T) { mustEnv(t, "AWS_ACCESS_KEY_ID") mustEnv(t, "AWS_SECRET_ACCESS_KEY") - mustEnv(t, "AWS_SESSION_TOKEN") + // mustEnv(t, "AWS_SESSION_TOKEN") mustEnv(t, "AWS_REGION") cmd := exec.Command("aws", "sts", "get-caller-identity")