Skip to content

Commit

Permalink
prepare for oidc (#148)
Browse files Browse the repository at this point in the history
  • Loading branch information
lonegunmanb authored Sep 24, 2024
1 parent 1addc48 commit a5cc22a
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 59 deletions.
39 changes: 17 additions & 22 deletions .github/workflows/acc-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,22 @@ on:
- '**/go.mod'

jobs:
acc-tests:
runs-on: [self-hosted, 1ES.Pool=terraform-azurerm-network]
environment:
name: acctests
check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: init
- name: Checking for Fork
shell: pwsh
run: |
docker run --rm -v $(pwd):/src -w /src mcr.microsoft.com/azterraform:latest make generate
- name: e2e test
run: |
sh scripts/ci-e2e.sh
- name: upload test version snapshots
uses: actions/upload-artifact@v3
with:
name: TestRecord-${{ github.event.number }}
retention-days: 60
path: |
examples/**/TestRecord.md.tmp
- name: version-upgrade test
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
sh scripts/ci-version-upgrade.sh
$isFork = "${{ github.event.pull_request.head.repo.fork }}"
if($isFork -eq "true") {
echo "### WARNING: This workflow is disabled for forked repositories. Please follow the [release branch process](https://azure.github.io/Azure-Verified-Modules/contributing/terraform/terraform-contribution-flow/#5-create-a-pull-request-to-the-upstream-repository) if end to end tests are required." >> $env:GITHUB_STEP_SUMMARY
}
run-e2e-tests:
if: github.event.pull_request.head.repo.fork == false
uses: Azure/tfmod-scaffold/.github/workflows/tfvm_e2e.yaml@main
name: end to end
secrets: inherit
permissions:
id-token: write
contents: read
30 changes: 0 additions & 30 deletions .github/workflows/weekly-e2e.yaml

This file was deleted.

9 changes: 2 additions & 7 deletions GNUmakefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
SHELL := /bin/bash

-include $(shell curl -sSL "https://raw.githubusercontent.com/Azure/tfmod-scaffold/main/scripts/install.sh" | bash -s > /dev/null ; echo tfmod-scaffold/GNUmakefile)

init:
@sh "$(CURDIR)/scripts/init.sh"

cleanup:
@sh "$(CURDIR)/scripts/cleanup.sh"
$(shell curl -H 'Cache-Control: no-cache, no-store' -sSL "https://raw.githubusercontent.com/Azure/tfmod-scaffold/refs/heads/main/GNUmakefile" -o tfvmmakefile)
-include tfvmmakefile

0 comments on commit a5cc22a

Please sign in to comment.