Skip to content

Commit

Permalink
5.7 cannot be used on 24.04
Browse files Browse the repository at this point in the history
Signed-off-by: Matt Lord <[email protected]>
  • Loading branch information
mattlord committed Oct 15, 2024
1 parent 21fd64a commit ece292a
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/unit_test_evalengine_mysql57.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:
jobs:
test:
name: Unit Test (evalengine_mysql57)
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: Skip CI
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
echo mysql-apt-config mysql-apt-config/select-server select mysql-5.7 | sudo debconf-set-selections
sudo DEBIAN_FRONTEND="noninteractive" dpkg -i mysql-apt-config*
sudo apt-get -qq update
sudo DEBIAN_FRONTEND="noninteractive" apt-get -qq install -y mysql-client=5.7* mysql-community-server=5.7* mysql-server=5.7* libncurses6
sudo DEBIAN_FRONTEND="noninteractive" apt-get -qq install -y mysql-client=5.7* mysql-community-server=5.7* mysql-server=5.7* libncurses5
sudo apt-get -qq install -y make unzip g++ curl git wget ant openjdk-11-jdk eatmydata
sudo service mysql stop
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit_test_evalengine_mysql80.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:
jobs:
test:
name: Unit Test (evalengine_mysql80)
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: Skip CI
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit_test_evalengine_mysql84.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:
jobs:
test:
name: Unit Test (evalengine_mysql84)
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: Skip CI
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit_test_mysql57.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:
jobs:
test:
name: Unit Test (mysql57)
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: Skip CI
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
echo mysql-apt-config mysql-apt-config/select-server select mysql-5.7 | sudo debconf-set-selections
sudo DEBIAN_FRONTEND="noninteractive" dpkg -i mysql-apt-config*
sudo apt-get -qq update
sudo DEBIAN_FRONTEND="noninteractive" apt-get -qq install -y mysql-client=5.7* mysql-community-server=5.7* mysql-server=5.7* libncurses6
sudo DEBIAN_FRONTEND="noninteractive" apt-get -qq install -y mysql-client=5.7* mysql-community-server=5.7* mysql-server=5.7* libncurses5
sudo apt-get -qq install -y make unzip g++ curl git wget ant openjdk-11-jdk eatmydata
sudo service mysql stop
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit_test_mysql80.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:
jobs:
test:
name: Unit Test (mysql80)
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: Skip CI
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit_test_mysql84.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:
jobs:
test:
name: Unit Test (mysql84)
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: Skip CI
Expand Down
4 changes: 2 additions & 2 deletions test/templates/cluster_endtoend_test_mysql57.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ env:
jobs:
build:
name: Run endtoend tests on {{.Name}}
runs-on: {{if .Cores16}}gh-hosted-runners-16cores-1{{else}}ubuntu-latest{{end}}
runs-on: {{if .Cores16}}gh-hosted-runners-16cores-1{{else}}ubuntu-22.04{{end}}

steps:
- name: Skip CI
Expand Down Expand Up @@ -133,7 +133,7 @@ jobs:
echo mysql-apt-config mysql-apt-config/select-server select mysql-5.7 | sudo debconf-set-selections
sudo DEBIAN_FRONTEND="noninteractive" dpkg -i mysql-apt-config*
sudo apt-get update
sudo DEBIAN_FRONTEND="noninteractive" apt-get install -y mysql-client=5.7* mysql-community-server=5.7* mysql-server=5.7* libncurses6
sudo DEBIAN_FRONTEND="noninteractive" apt-get install -y mysql-client=5.7* mysql-community-server=5.7* mysql-server=5.7* libncurses5

sudo apt-get install -y make unzip g++ etcd-client etcd-server curl git wget eatmydata
sudo service mysql stop
Expand Down
4 changes: 2 additions & 2 deletions test/templates/unit_test.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:
jobs:
test:
name: {{.Name}}
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: Skip CI
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
echo mysql-apt-config mysql-apt-config/select-server select mysql-5.7 | sudo debconf-set-selections
sudo DEBIAN_FRONTEND="noninteractive" dpkg -i mysql-apt-config*
sudo apt-get -qq update
sudo DEBIAN_FRONTEND="noninteractive" apt-get -qq install -y mysql-client=5.7* mysql-community-server=5.7* mysql-server=5.7* libncurses6
sudo DEBIAN_FRONTEND="noninteractive" apt-get -qq install -y mysql-client=5.7* mysql-community-server=5.7* mysql-server=5.7* libncurses5
{{end}}

{{if (eq .Platform "mysql80")}}
Expand Down

0 comments on commit ece292a

Please sign in to comment.