Skip to content

Commit b1eb3e8

Browse files
Fix new test
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
1 parent 59a8012 commit b1eb3e8

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

.github/workflows/vitess_tester_vtgate.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,14 @@ env:
1212
LAUNCHABLE_ORGANIZATION: "vitess"
1313
LAUNCHABLE_WORKSPACE: "vitess-app"
1414
GITHUB_PR_HEAD_SHA: "${{ github.event.pull_request.head.sha }}"
15+
GOPRIVATE: github.com/slackhq/vitess-addons
16+
GH_ACCESS_TOKEN: "${{`{{ secrets.GH_ACCESS_TOKEN }}`}}"
1517

1618
jobs:
1719
build:
1820
name: Run endtoend tests on Vitess Tester (vtgate)
19-
runs-on: gh-hosted-runners-4cores-1
21+
runs-on:
22+
group: vitess-ubuntu20
2023

2124
steps:
2225
- name: Skip CI
@@ -75,6 +78,10 @@ jobs:
7578
with:
7679
go-version: 1.22.5
7780

81+
- name: Setup github.com/slackhq/vitess-additions access token
82+
if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
83+
run: git config --global url.https://$GH_ACCESS_TOKEN@github.com/.insteadOf https://github.com/
84+
7885
- name: Set up python
7986
if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
8087
uses: actions/setup-python@v5

test/templates/cluster_endtoend_test_mysql57.tpl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,7 @@ jobs:
138138
wget "https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb"
139139
sudo apt-get install -y gnupg2
140140
sudo dpkg -i "percona-release_latest.$(lsb_release -sc)_all.deb"
141-
<<<<<<< HEAD
142-
sudo percona-release enable-only pxb-24
143-
=======
144141
sudo percona-release enable-only tools
145-
>>>>>>> v19.0.5
146142
sudo apt-get update
147143
if [[ -n $XTRABACKUP_VERSION ]]; then
148144
debfile="percona-xtrabackup-24_$XTRABACKUP_VERSION.$(lsb_release -sc)_amd64.deb"

test/templates/cluster_vitess_tester.tpl

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,14 @@ env:
1010
LAUNCHABLE_ORGANIZATION: "vitess"
1111
LAUNCHABLE_WORKSPACE: "vitess-app"
1212
GITHUB_PR_HEAD_SHA: "${{`{{ github.event.pull_request.head.sha }}`}}"
13+
GOPRIVATE: github.com/slackhq/vitess-addons
14+
GH_ACCESS_TOKEN: "${{ secrets.GH_ACCESS_TOKEN }}"
1315

1416
jobs:
1517
build:
1618
name: Run endtoend tests on {{.Name}}
17-
runs-on: gh-hosted-runners-4cores-1
19+
runs-on:
20+
group: vitess-ubuntu20
1821

1922
steps:
2023
- name: Skip CI
@@ -73,6 +76,10 @@ jobs:
7376
with:
7477
go-version: 1.22.5
7578

79+
- name: Setup github.com/slackhq/vitess-addons access token
80+
if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
81+
run: git config --global url.https://$GH_ACCESS_TOKEN@github.com/.insteadOf https://github.com/
82+
7683
- name: Set up python
7784
if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
7885
uses: actions/setup-python@v5

0 commit comments

Comments
 (0)