From bacb34379ed262d0b300b0138f625ccc3f358b9e Mon Sep 17 00:00:00 2001 From: Michael Zalimeni Date: Tue, 20 Jun 2023 13:52:08 -0400 Subject: [PATCH] Set GOPRIVATE for all hashicorp repos in CI Consistently set GOPRIVATE to include all hashicorp repos, s.t. private modules are successfully pulled in enterprise CI. --- .github/workflows/build-artifacts.yml | 2 +- .github/workflows/build-distros.yml | 1 + .github/workflows/build.yml | 1 + .github/workflows/go-tests.yml | 1 + .github/workflows/nightly-test-1.13.x.yaml | 5 +++-- .github/workflows/nightly-test-1.14.x.yaml | 5 +++-- .github/workflows/nightly-test-1.15.x.yaml | 5 +++-- .github/workflows/nightly-test-1.16.x.yaml | 5 +++-- .github/workflows/nightly-test-main.yaml | 5 +++-- .github/workflows/reusable-lint.yml | 1 + .github/workflows/reusable-unit-split.yml | 1 + .github/workflows/reusable-unit.yml | 1 + .github/workflows/test-integrations.yml | 1 + 13 files changed, 23 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index 9d7a2583f945..57e2eba8e4ae 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -13,7 +13,7 @@ permissions: contents: read env: - GOPRIVATE: github.com/hashicorp + GOPRIVATE: github.com/hashicorp # Required for enterprise deps jobs: setup: diff --git a/.github/workflows/build-distros.yml b/.github/workflows/build-distros.yml index 166706493f24..8b88345d2ee2 100644 --- a/.github/workflows/build-distros.yml +++ b/.github/workflows/build-distros.yml @@ -15,6 +15,7 @@ permissions: env: GOTAGS: ${{ endsWith(github.repository, '-enterprise') && 'consulent' || '' }} + GOPRIVATE: github.com/hashicorp # Required for enterprise deps jobs: setup: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cfeab4a04c12..9186f12bfe25 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,6 +14,7 @@ on: env: PKG_NAME: consul METADATA: oss + GOPRIVATE: github.com/hashicorp # Required for enterprise deps jobs: set-product-version: diff --git a/.github/workflows/go-tests.yml b/.github/workflows/go-tests.yml index 0d3b6b0992fd..c8059b998eda 100644 --- a/.github/workflows/go-tests.yml +++ b/.github/workflows/go-tests.yml @@ -21,6 +21,7 @@ permissions: env: TEST_RESULTS: /tmp/test-results + GOPRIVATE: github.com/hashicorp # Required for enterprise deps jobs: setup: diff --git a/.github/workflows/nightly-test-1.13.x.yaml b/.github/workflows/nightly-test-1.13.x.yaml index 767072b6d247..de852c9114c5 100644 --- a/.github/workflows/nightly-test-1.13.x.yaml +++ b/.github/workflows/nightly-test-1.13.x.yaml @@ -8,9 +8,10 @@ on: workflow_dispatch: {} env: - EMBER_PARTITION_TOTAL: 4 # Has to be changed in tandem with the matrix.partition + EMBER_PARTITION_TOTAL: 4 # Has to be changed in tandem with the matrix.partition BRANCH: "release/1.13.x" - BRANCH_NAME: "release-1.13.x" # Used for naming artifacts + BRANCH_NAME: "release-1.13.x" # Used for naming artifacts + GOPRIVATE: github.com/hashicorp # Required for enterprise deps jobs: frontend-test-workspace-node: diff --git a/.github/workflows/nightly-test-1.14.x.yaml b/.github/workflows/nightly-test-1.14.x.yaml index fb34eb0d1bf3..1f319b4bd3ec 100644 --- a/.github/workflows/nightly-test-1.14.x.yaml +++ b/.github/workflows/nightly-test-1.14.x.yaml @@ -8,9 +8,10 @@ on: workflow_dispatch: {} env: - EMBER_PARTITION_TOTAL: 4 # Has to be changed in tandem with the matrix.partition + EMBER_PARTITION_TOTAL: 4 # Has to be changed in tandem with the matrix.partition BRANCH: "release/1.14.x" - BRANCH_NAME: "release-1.14.x" # Used for naming artifacts + BRANCH_NAME: "release-1.14.x" # Used for naming artifacts + GOPRIVATE: github.com/hashicorp # Required for enterprise deps jobs: frontend-test-workspace-node: diff --git a/.github/workflows/nightly-test-1.15.x.yaml b/.github/workflows/nightly-test-1.15.x.yaml index 99b8a2b18861..d41cf84a6247 100644 --- a/.github/workflows/nightly-test-1.15.x.yaml +++ b/.github/workflows/nightly-test-1.15.x.yaml @@ -8,9 +8,10 @@ on: workflow_dispatch: {} env: - EMBER_PARTITION_TOTAL: 4 # Has to be changed in tandem with the matrix.partition + EMBER_PARTITION_TOTAL: 4 # Has to be changed in tandem with the matrix.partition BRANCH: "release/1.15.x" - BRANCH_NAME: "release-1.15.x" # Used for naming artifacts + BRANCH_NAME: "release-1.15.x" # Used for naming artifacts + GOPRIVATE: github.com/hashicorp # Required for enterprise deps jobs: frontend-test-workspace-node: diff --git a/.github/workflows/nightly-test-1.16.x.yaml b/.github/workflows/nightly-test-1.16.x.yaml index db63ef83fecf..98a1f364b69e 100644 --- a/.github/workflows/nightly-test-1.16.x.yaml +++ b/.github/workflows/nightly-test-1.16.x.yaml @@ -8,9 +8,10 @@ on: workflow_dispatch: {} env: - EMBER_PARTITION_TOTAL: 4 # Has to be changed in tandem with the matrix.partition + EMBER_PARTITION_TOTAL: 4 # Has to be changed in tandem with the matrix.partition BRANCH: "release/1.16.x" - BRANCH_NAME: "release-1.16.x" # Used for naming artifacts + BRANCH_NAME: "release-1.16.x" # Used for naming artifacts + GOPRIVATE: github.com/hashicorp # Required for enterprise deps jobs: frontend-test-workspace-node: diff --git a/.github/workflows/nightly-test-main.yaml b/.github/workflows/nightly-test-main.yaml index f7958b53ce5e..13048656b6b0 100644 --- a/.github/workflows/nightly-test-main.yaml +++ b/.github/workflows/nightly-test-main.yaml @@ -8,9 +8,10 @@ on: workflow_dispatch: {} env: - EMBER_PARTITION_TOTAL: 4 # Has to be changed in tandem with the matrix.partition + EMBER_PARTITION_TOTAL: 4 # Has to be changed in tandem with the matrix.partition BRANCH: "main" - BRANCH_NAME: "main" # Used for naming artifacts + BRANCH_NAME: "main" # Used for naming artifacts + GOPRIVATE: github.com/hashicorp # Required for enterprise deps jobs: frontend-test-workspace-node: diff --git a/.github/workflows/reusable-lint.yml b/.github/workflows/reusable-lint.yml index fd1e8b9a1538..9a9a26f0267e 100644 --- a/.github/workflows/reusable-lint.yml +++ b/.github/workflows/reusable-lint.yml @@ -20,6 +20,7 @@ on: env: GOTAGS: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}" GOARCH: ${{inputs.go-arch}} + GOPRIVATE: github.com/hashicorp # Required for enterprise deps jobs: lint: diff --git a/.github/workflows/reusable-unit-split.yml b/.github/workflows/reusable-unit-split.yml index 962467d833a4..e2da1920967e 100644 --- a/.github/workflows/reusable-unit-split.yml +++ b/.github/workflows/reusable-unit-split.yml @@ -51,6 +51,7 @@ env: TOTAL_RUNNERS: ${{inputs.runner-count}} CONSUL_LICENSE: ${{secrets.consul-license}} GOTAGS: ${{ inputs.go-tags}} + GOPRIVATE: github.com/hashicorp # Required for enterprise deps DATADOG_API_KEY: ${{secrets.datadog-api-key}} jobs: diff --git a/.github/workflows/reusable-unit.yml b/.github/workflows/reusable-unit.yml index 6001cc8bcd11..3f7ffa277412 100644 --- a/.github/workflows/reusable-unit.yml +++ b/.github/workflows/reusable-unit.yml @@ -46,6 +46,7 @@ env: GOARCH: ${{inputs.go-arch}} CONSUL_LICENSE: ${{secrets.consul-license}} GOTAGS: ${{ inputs.go-tags}} + GOPRIVATE: github.com/hashicorp # Required for enterprise deps DATADOG_API_KEY: ${{secrets.datadog-api-key}} jobs: diff --git a/.github/workflows/test-integrations.yml b/.github/workflows/test-integrations.yml index 836ed56ee180..af00fe46a2f7 100644 --- a/.github/workflows/test-integrations.yml +++ b/.github/workflows/test-integrations.yml @@ -23,6 +23,7 @@ env: CONSUL_BINARY_UPLOAD_NAME: consul-bin # strip the hashicorp/ off the front of github.repository for consul CONSUL_LATEST_IMAGE_NAME: ${{ endsWith(github.repository, '-enterprise') && github.repository || 'consul' }} + GOPRIVATE: github.com/hashicorp # Required for enterprise deps jobs: setup: