Skip to content

Commit b410aaa

Browse files
dbussinkdbussink
committed
Update additional jobs to use 8.4
This was missed in the change where we moved the majority to 8.4. Signed-off-by: Dirkjan Bussink <[email protected]>
1 parent 202f730 commit b410aaa

19 files changed

+88
-28
lines changed

‎.github/workflows/codeql_analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
# Install mysql80
6464
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A8D3785C
6565
wget -c https://dev.mysql.com/get/mysql-apt-config_0.8.34-1_all.deb
66-
echo mysql-apt-config mysql-apt-config/select-server select mysql-8.0 | sudo debconf-set-selections
66+
echo mysql-apt-config mysql-apt-config/select-server select mysql-8.4-lts | sudo debconf-set-selections
6767
sudo DEBIAN_FRONTEND="noninteractive" dpkg -i mysql-apt-config*
6868
sudo apt-get update
6969
sudo DEBIAN_FRONTEND="noninteractive" apt-get install -y mysql-server mysql-client

‎.github/workflows/unit_test_evalengine_mysql80.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A8D3785C
108108
wget -c https://dev.mysql.com/get/mysql-apt-config_0.8.34-1_all.deb
109109
110-
echo mysql-apt-config mysql-apt-config/select-server select mysql-8.0 | sudo debconf-set-selections
110+
echo mysql-apt-config mysql-apt-config/select-server select mysql-8.4-lts | sudo debconf-set-selections
111111
sudo DEBIAN_FRONTEND="noninteractive" dpkg -i mysql-apt-config*
112112
sudo apt-get update
113113
sudo DEBIAN_FRONTEND="noninteractive" apt-get install -y mysql-server mysql-client

‎.github/workflows/unit_test_mysql80.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A8D3785C
108108
wget -c https://dev.mysql.com/get/mysql-apt-config_0.8.34-1_all.deb
109109
110-
echo mysql-apt-config mysql-apt-config/select-server select mysql-8.0 | sudo debconf-set-selections
110+
echo mysql-apt-config mysql-apt-config/select-server select mysql-8.4-lts | sudo debconf-set-selections
111111
sudo DEBIAN_FRONTEND="noninteractive" dpkg -i mysql-apt-config*
112112
sudo apt-get update
113113
sudo DEBIAN_FRONTEND="noninteractive" apt-get install -y mysql-server mysql-client

‎.github/workflows/upgrade_downgrade_test_backups_e2e.yml

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,33 @@ jobs:
8989
timeout-minutes: 10
9090
if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
9191
run: |
92+
sudo DEBIAN_FRONTEND="noninteractive" apt-get update
93+
# Uninstall any nextly installed MySQL first
94+
# sudo systemctl stop apparmor
95+
sudo DEBIAN_FRONTEND="noninteractive" apt-get remove -y --purge mysql-server mysql-client mysql-common
96+
sudo apt-get -y autoremove
97+
sudo apt-get -y autoclean
98+
# sudo deluser mysql
99+
sudo rm -rf /var/lib/mysql
100+
sudo rm -rf /etc/mysql
101+
102+
# Install MySQL 8.4
103+
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A8D3785C
104+
wget -c https://dev.mysql.com/get/mysql-apt-config_0.8.34-1_all.deb
105+
echo mysql-apt-config mysql-apt-config/select-server select mysql-8.4-lts | sudo debconf-set-selections
106+
sudo DEBIAN_FRONTEND="noninteractive" dpkg -i mysql-apt-config*
92107
sudo apt-get update
93-
sudo apt-get install -y mysql-server mysql-client make unzip g++ etcd-client etcd-server curl git wget eatmydata
94-
108+
sudo DEBIAN_FRONTEND="noninteractive" apt-get install -y mysql-server mysql-client
109+
110+
# Install everything else we need, and configure
111+
sudo apt-get install -y make unzip g++ etcd-client etcd-server curl git wget eatmydata grep
112+
95113
sudo service mysql stop
96114
sudo service etcd stop
115+
sudo bash -c "echo '/usr/sbin/mysqld { }' > /etc/apparmor.d/usr.sbin.mysqld" # https://bugs.launchpad.net/ubuntu/+source/mariadb-10.1/+bug/1806263
97116
sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
98-
sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
117+
sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld || echo "could not remove mysqld profile"
118+
99119
go mod download
100120
101121
# install JUnit report formatter

‎.github/workflows/upgrade_downgrade_test_backups_e2e_next_release.yml

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,33 @@ jobs:
9191
timeout-minutes: 10
9292
if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
9393
run: |
94+
sudo DEBIAN_FRONTEND="noninteractive" apt-get update
95+
# Uninstall any nextly installed MySQL first
96+
# sudo systemctl stop apparmor
97+
sudo DEBIAN_FRONTEND="noninteractive" apt-get remove -y --purge mysql-server mysql-client mysql-common
98+
sudo apt-get -y autoremove
99+
sudo apt-get -y autoclean
100+
# sudo deluser mysql
101+
sudo rm -rf /var/lib/mysql
102+
sudo rm -rf /etc/mysql
103+
104+
# Install MySQL 8.4
105+
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A8D3785C
106+
wget -c https://dev.mysql.com/get/mysql-apt-config_0.8.34-1_all.deb
107+
echo mysql-apt-config mysql-apt-config/select-server select mysql-8.4-lts | sudo debconf-set-selections
108+
sudo DEBIAN_FRONTEND="noninteractive" dpkg -i mysql-apt-config*
94109
sudo apt-get update
95-
sudo apt-get install -y mysql-server mysql-client make unzip g++ etcd-client etcd-server curl git wget eatmydata
96-
110+
sudo DEBIAN_FRONTEND="noninteractive" apt-get install -y mysql-server mysql-client
111+
112+
# Install everything else we need, and configure
113+
sudo apt-get install -y make unzip g++ etcd-client etcd-server curl git wget eatmydata grep
114+
97115
sudo service mysql stop
98116
sudo service etcd stop
117+
sudo bash -c "echo '/usr/sbin/mysqld { }' > /etc/apparmor.d/usr.sbin.mysqld" # https://bugs.launchpad.net/ubuntu/+source/mariadb-10.1/+bug/1806263
99118
sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
100-
sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
119+
sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld || echo "could not remove mysqld profile"
120+
101121
go mod download
102122
103123
# install JUnit report formatter

‎.github/workflows/upgrade_downgrade_test_backups_manual.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,10 @@ jobs:
103103
# sudo rm -rf /var/lib/mysql
104104
# sudo rm -rf /etc/mysql
105105
106-
# Install MySQL 8.0
106+
# Install MySQL 8.4
107107
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A8D3785C
108108
wget -c https://dev.mysql.com/get/mysql-apt-config_0.8.34-1_all.deb
109-
echo mysql-apt-config mysql-apt-config/select-server select mysql-8.0 | sudo debconf-set-selections
109+
echo mysql-apt-config mysql-apt-config/select-server select mysql-8.4-lts | sudo debconf-set-selections
110110
sudo DEBIAN_FRONTEND="noninteractive" dpkg -i mysql-apt-config*
111111
sudo apt-get update
112112
sudo DEBIAN_FRONTEND="noninteractive" apt-get install -y mysql-server mysql-client

‎.github/workflows/upgrade_downgrade_test_backups_manual_next_release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,10 @@ jobs:
104104
sudo rm -rf /var/lib/mysql
105105
sudo rm -rf /etc/mysql
106106
107-
# Install MySQL 8.0
107+
# Install MySQL 8.4
108108
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A8D3785C
109109
wget -c https://dev.mysql.com/get/mysql-apt-config_0.8.34-1_all.deb
110-
echo mysql-apt-config mysql-apt-config/select-server select mysql-8.0 | sudo debconf-set-selections
110+
echo mysql-apt-config mysql-apt-config/select-server select mysql-8.4-lts | sudo debconf-set-selections
111111
sudo DEBIAN_FRONTEND="noninteractive" dpkg -i mysql-apt-config*
112112
sudo apt-get update
113113
sudo DEBIAN_FRONTEND="noninteractive" apt-get install -y mysql-server mysql-client

‎.github/workflows/upgrade_downgrade_test_onlineddl_flow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ jobs:
113113
# Install mysql80
114114
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A8D3785C
115115
wget -c https://dev.mysql.com/get/mysql-apt-config_0.8.34-1_all.deb
116-
echo mysql-apt-config mysql-apt-config/select-server select mysql-8.0 | sudo debconf-set-selections
116+
echo mysql-apt-config mysql-apt-config/select-server select mysql-8.4-lts | sudo debconf-set-selections
117117
sudo DEBIAN_FRONTEND="noninteractive" dpkg -i mysql-apt-config*
118118
sudo apt-get update
119119
sudo DEBIAN_FRONTEND="noninteractive" apt-get install -y mysql-server mysql-client

‎.github/workflows/upgrade_downgrade_test_query_serving_queries.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
# Install mysql80
106106
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A8D3785C
107107
wget -c https://dev.mysql.com/get/mysql-apt-config_0.8.34-1_all.deb
108-
echo mysql-apt-config mysql-apt-config/select-server select mysql-8.0 | sudo debconf-set-selections
108+
echo mysql-apt-config mysql-apt-config/select-server select mysql-8.4-lts | sudo debconf-set-selections
109109
sudo DEBIAN_FRONTEND="noninteractive" dpkg -i mysql-apt-config*
110110
sudo apt-get update
111111
sudo DEBIAN_FRONTEND="noninteractive" apt-get install -y mysql-server mysql-client

‎.github/workflows/upgrade_downgrade_test_query_serving_queries_2.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
# Install mysql80
106106
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A8D3785C
107107
wget -c https://dev.mysql.com/get/mysql-apt-config_0.8.34-1_all.deb
108-
echo mysql-apt-config mysql-apt-config/select-server select mysql-8.0 | sudo debconf-set-selections
108+
echo mysql-apt-config mysql-apt-config/select-server select mysql-8.4-lts | sudo debconf-set-selections
109109
sudo DEBIAN_FRONTEND="noninteractive" dpkg -i mysql-apt-config*
110110
sudo apt-get update
111111
sudo DEBIAN_FRONTEND="noninteractive" apt-get install -y mysql-server mysql-client

0 commit comments

Comments
 (0)