diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/main.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/main.yml index 7e9aa7c649..9b5e2ef9ea 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/main.yml +++ b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/main.yml @@ -419,6 +419,9 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} version: v2.4.0 +#{{- if .Config.actions.preTest }}# +#{{ .Config.actions.preTest | toYaml | indent 4 }}# +#{{- end }}# - name: Run tests run: cd examples && go test -v -json -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/master.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/master.yml index 107592f0a9..011e043e7e 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/master.yml +++ b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/master.yml @@ -419,6 +419,9 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} version: v2.4.0 +#{{- if .Config.actions.preTest }}# +#{{ .Config.actions.preTest | toYaml | indent 4 }}# +#{{- end }}# - name: Run tests run: cd examples && go test -v -json -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/nightly-test.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/nightly-test.yml index d1948526a9..2ce7020123 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/nightly-test.yml +++ b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/nightly-test.yml @@ -289,6 +289,9 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} version: v2.4.0 +#{{- if .Config.actions.preTest }}# +#{{ .Config.actions.preTest | toYaml | indent 4 }}# +#{{- end }}# - name: Run tests run: cd examples && go test -v -json -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/prerelease.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/prerelease.yml index a5e707d128..f9e26870ec 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/prerelease.yml +++ b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/prerelease.yml @@ -370,6 +370,9 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} version: v2.4.0 +#{{- if .Config.actions.preTest }}# +#{{ .Config.actions.preTest | toYaml | indent 4 }}# +#{{- end }}# - name: Run tests run: cd examples && go test -v -json -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/release.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/release.yml index af407da9e2..2667cc4ff2 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/release.yml +++ b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/release.yml @@ -398,6 +398,9 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} version: v2.4.0 +#{{- if .Config.actions.preTest }}# +#{{ .Config.actions.preTest | toYaml | indent 4 }}# +#{{- end }}# - name: Run tests run: cd examples && go test -v -json -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/run-acceptance-tests.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/run-acceptance-tests.yml index af853dd973..08a4e07922 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/run-acceptance-tests.yml +++ b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/run-acceptance-tests.yml @@ -357,12 +357,9 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} version: v2.4.0 - #{{- if .Config.digitalOceanSshKey }}# - - name: Setup SSH key - uses: webfactory/ssh-agent@v0.7.0 - with: - ssh-private-key: ${{ secrets.PRIVATE_SSH_KEY_FOR_DIGITALOCEAN }} - #{{- end }}# +#{{- if .Config.actions.preTest }}# +#{{ .Config.actions.preTest | toYaml | indent 4 }}# +#{{- end }}# - name: Run tests run: cd examples && go test -v -json -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt diff --git a/provider-ci/providers/docker/config.yaml b/provider-ci/providers/docker/config.yaml index 9b387b8eaf..0d40c8491c 100644 --- a/provider-ci/providers/docker/config.yaml +++ b/provider-ci/providers/docker/config.yaml @@ -3,7 +3,6 @@ major-version: 4 aws: true gcp: true gcpRegistry: true -digitalOceanSshKey: true env: AWS_REGION: us-west-2 ARM_CLIENT_ID: "30e520fa-12b4-4e21-b473-9426c5ac2e1e" @@ -28,3 +27,9 @@ plugins: - name: aws version: "5.37.0" team: ecosystem +actions: + preTest: + - name: Setup SSH key + uses: webfactory/ssh-agent@v0.7.0 + with: + ssh-private-key: ${{ secrets.PRIVATE_SSH_KEY_FOR_DIGITALOCEAN }} diff --git a/provider-ci/providers/docker/repo/.github/workflows/main.yml b/provider-ci/providers/docker/repo/.github/workflows/main.yml index 1a75ed2b2d..f51efd11ed 100644 --- a/provider-ci/providers/docker/repo/.github/workflows/main.yml +++ b/provider-ci/providers/docker/repo/.github/workflows/main.yml @@ -471,6 +471,10 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} version: v2.4.0 + - name: Setup SSH key + uses: webfactory/ssh-agent@v0.7.0 + with: + ssh-private-key: ${{ secrets.PRIVATE_SSH_KEY_FOR_DIGITALOCEAN }} - name: Run tests run: cd examples && go test -v -json -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt diff --git a/provider-ci/providers/docker/repo/.github/workflows/master.yml b/provider-ci/providers/docker/repo/.github/workflows/master.yml index 8956a04daf..5097bc12df 100644 --- a/provider-ci/providers/docker/repo/.github/workflows/master.yml +++ b/provider-ci/providers/docker/repo/.github/workflows/master.yml @@ -471,6 +471,10 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} version: v2.4.0 + - name: Setup SSH key + uses: webfactory/ssh-agent@v0.7.0 + with: + ssh-private-key: ${{ secrets.PRIVATE_SSH_KEY_FOR_DIGITALOCEAN }} - name: Run tests run: cd examples && go test -v -json -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt diff --git a/provider-ci/providers/docker/repo/.github/workflows/prerelease.yml b/provider-ci/providers/docker/repo/.github/workflows/prerelease.yml index b3a6f080c6..67076688e7 100644 --- a/provider-ci/providers/docker/repo/.github/workflows/prerelease.yml +++ b/provider-ci/providers/docker/repo/.github/workflows/prerelease.yml @@ -417,6 +417,10 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} version: v2.4.0 + - name: Setup SSH key + uses: webfactory/ssh-agent@v0.7.0 + with: + ssh-private-key: ${{ secrets.PRIVATE_SSH_KEY_FOR_DIGITALOCEAN }} - name: Run tests run: cd examples && go test -v -json -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt diff --git a/provider-ci/providers/docker/repo/.github/workflows/release.yml b/provider-ci/providers/docker/repo/.github/workflows/release.yml index deb2922a34..429a385313 100644 --- a/provider-ci/providers/docker/repo/.github/workflows/release.yml +++ b/provider-ci/providers/docker/repo/.github/workflows/release.yml @@ -443,6 +443,10 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} version: v2.4.0 + - name: Setup SSH key + uses: webfactory/ssh-agent@v0.7.0 + with: + ssh-private-key: ${{ secrets.PRIVATE_SSH_KEY_FOR_DIGITALOCEAN }} - name: Run tests run: cd examples && go test -v -json -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt