Skip to content

Commit bc89b66

Browse files
use nonroot for mysql; only build for arm;
1 parent 0f199fc commit bc89b66

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

tests/ci/cdk/cdk/codebuild/github_ci_integration_omnibus.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ batch:
102102

103103
# MySQL build is bloated without any obvious build configurations we can use to speed up the build, so we use a larger instance here.
104104
- identifier: mysql_integration_x86_64
105-
buildspec: tests/ci/codebuild/common/run_simple_target.yml
105+
buildspec: tests/ci/codebuild/common/run_nonroot_target.yml
106106
env:
107107
type: LINUX_CONTAINER
108108
privileged-mode: false
@@ -112,7 +112,7 @@ batch:
112112
AWS_LC_CI_TARGET: "tests/ci/integration/run_mysql_integration.sh"
113113

114114
- identifier: mysql_integration_aarch
115-
buildspec: tests/ci/codebuild/common/run_simple_target.yml
115+
buildspec: tests/ci/codebuild/common/run_nonroot_target.yml
116116
env:
117117
type: ARM_CONTAINER
118118
privileged-mode: false

tests/ci/integration/run_mysql_integration.sh

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,6 @@ function mysql_run_tests() {
6565
main.udf_bug35242734 : Bug#0000 mysqld is not managed by supervisor process
6666
main.file_contents : Bug#0000 Cannot open 'INFO_SRC' in ''
6767
main.resource_group_thr_prio_unsupported : Bug#0000 Invalid thread priority value -5
68-
main.dd_upgrade_error_cs : Bug#0000 running mysqld as root
69-
main.basedir : Bug#0000 running mysqld as root
70-
main.lowercase_fs_off : Bug#0000 running mysqld as root
71-
main.upgrade : Bug#0000 running mysqld as root
72-
main.partition_prefixkey_upgrade : Bug#0000 running mysqld as root
73-
main.mysqld_cmdline_warnings : Bug#0000 running mysqld as root
7468
main.mysqld_daemon : Bug#0000 failed, error: 256, status: 1, errno: 2.
7569
main.mysqld_safe : Bug#0000 nonexistent: No such file or directory
7670
main.grant_user_lock : Bug#0000 Access denied for user root at localhost
@@ -127,7 +121,12 @@ mysql_patch_tests
127121
mysql_patch_error_strings
128122

129123
mysql_build
130-
mysql_run_tests
124+
if [ $(uname -p) != "aarch64" ]; then
125+
# MySQL's tests use extensive resources. They are slow on ARM and flaky race conditions occur.
126+
# TODO: Enable ARM testing when Codebuild releases a larger ARM type (Current Type: 16vCPU, 32GB).
127+
mysql_run_tests
128+
fi
129+
131130
popd
132131

133132
ldd "${MYSQL_BUILD_FOLDER}/lib/libmysqlclient.so" | grep "${AWS_LC_INSTALL_FOLDER}/lib/libcrypto.so" || exit 1

0 commit comments

Comments
 (0)