From c719465a4ab0c6c9cdab3a789702a4b96ad5a25f Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Sat, 1 Jun 2024 00:01:54 +0200 Subject: [PATCH] Fix reparent old tests Signed-off-by: Tim Vaillancourt --- .../workflows/upgrade_downgrade_test_reparent_old_vtctl.yml | 6 ++++++ .../upgrade_downgrade_test_reparent_old_vttablet.yml | 6 ++++++ build.env | 1 + 3 files changed, 13 insertions(+) diff --git a/.github/workflows/upgrade_downgrade_test_reparent_old_vtctl.yml b/.github/workflows/upgrade_downgrade_test_reparent_old_vtctl.yml index bcdf50ce845..04c7c275dec 100644 --- a/.github/workflows/upgrade_downgrade_test_reparent_old_vtctl.yml +++ b/.github/workflows/upgrade_downgrade_test_reparent_old_vtctl.yml @@ -18,6 +18,9 @@ jobs: name: Run Upgrade Downgrade Test - Reparent Old Vtctl runs-on: group: vitess-ubuntu20 + env: + GOPRIVATE: github.com/slackhq/vitess-addons + GH_ACCESS_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }} steps: - name: Skip CI @@ -78,6 +81,9 @@ jobs: with: go-version: 1.22.3 + - name: Setup github.com/slackhq/vitess-additions access token + run: git config --global url.https://$GH_ACCESS_TOKEN@github.com/.insteadOf https://github.com/ + - name: Set up python if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' uses: actions/setup-python@v5 diff --git a/.github/workflows/upgrade_downgrade_test_reparent_old_vttablet.yml b/.github/workflows/upgrade_downgrade_test_reparent_old_vttablet.yml index 7d2070c4eb5..a4956bec2d3 100644 --- a/.github/workflows/upgrade_downgrade_test_reparent_old_vttablet.yml +++ b/.github/workflows/upgrade_downgrade_test_reparent_old_vttablet.yml @@ -18,6 +18,9 @@ jobs: name: Run Upgrade Downgrade Test - Reparent Old VTTablet runs-on: group: vitess-ubuntu20 + env: + GOPRIVATE: github.com/slackhq/vitess-addons + GH_ACCESS_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }} steps: - name: Skip CI @@ -78,6 +81,9 @@ jobs: with: go-version: 1.22.3 + - name: Setup github.com/slackhq/vitess-additions access token + run: git config --global url.https://$GH_ACCESS_TOKEN@github.com/.insteadOf https://github.com/ + - name: Set up python if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' uses: actions/setup-python@v5 diff --git a/build.env b/build.env index 32243db4507..1f3905536a6 100755 --- a/build.env +++ b/build.env @@ -50,5 +50,6 @@ export EXTRA_BIN=$PWD/test/bin # support private github.com/slackhq/vitess-addons repo if [[ -n "${GH_ACCESS_TOKEN}" ]]; then + export GOPRIVATE=github.com/slackhq/vitess-addons git config --global url.https://${GH_ACCESS_TOKEN}@github.com/.insteadOf https://github.com/ fi