Fix new test

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
slackhq · Jul 30, 2024 · b1eb3e8 · b1eb3e8
1 parent 59a8012
commit b1eb3e8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/.github/workflows/vitess_tester_vtgate.yml b/.github/workflows/vitess_tester_vtgate.yml
@@ -12,11 +12,14 @@ env:
  LAUNCHABLE_ORGANIZATION: "vitess"
  LAUNCHABLE_WORKSPACE: "vitess-app"
  GITHUB_PR_HEAD_SHA: "${{ github.event.pull_request.head.sha }}"
+ GOPRIVATE: github.com/slackhq/vitess-addons
+ GH_ACCESS_TOKEN: "${{`{{ secrets.GH_ACCESS_TOKEN }}`}}"
 
 jobs:
  build:
  name: Run endtoend tests on Vitess Tester (vtgate)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on:
+ group: vitess-ubuntu20
 
  steps:
  - name: Skip CI
@@ -75,6 +78,10 @@ jobs:
  with:
  go-version: 1.22.5
 
+ - name: Setup github.com/slackhq/vitess-additions access token
+ if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
+ 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/test/templates/cluster_endtoend_test_mysql57.tpl b/test/templates/cluster_endtoend_test_mysql57.tpl
@@ -138,11 +138,7 @@ jobs:
  wget "https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb"
  sudo apt-get install -y gnupg2
  sudo dpkg -i "percona-release_latest.$(lsb_release -sc)_all.deb"
-<<<<<<< HEAD
- sudo percona-release enable-only pxb-24
-=======
  sudo percona-release enable-only tools
->>>>>>> v19.0.5
  sudo apt-get update
  if [[ -n $XTRABACKUP_VERSION ]]; then
  debfile="percona-xtrabackup-24_$XTRABACKUP_VERSION.$(lsb_release -sc)_amd64.deb"

diff --git a/test/templates/cluster_vitess_tester.tpl b/test/templates/cluster_vitess_tester.tpl
@@ -10,11 +10,14 @@ env:
  LAUNCHABLE_ORGANIZATION: "vitess"
  LAUNCHABLE_WORKSPACE: "vitess-app"
  GITHUB_PR_HEAD_SHA: "${{`{{ github.event.pull_request.head.sha }}`}}"
+ GOPRIVATE: github.com/slackhq/vitess-addons
+ GH_ACCESS_TOKEN: "${{ secrets.GH_ACCESS_TOKEN }}"
 
 jobs:
  build:
  name: Run endtoend tests on {{.Name}}
- runs-on: gh-hosted-runners-4cores-1
+ runs-on:
+ group: vitess-ubuntu20
 
  steps:
  - name: Skip CI
@@ -73,6 +76,10 @@ jobs:
  with:
  go-version: 1.22.5
 
+ - name: Setup github.com/slackhq/vitess-addons access token
+ if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
+ 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