Skip to content

Commit

Permalink
use nonroot for mysql; only build for arm;
Browse files Browse the repository at this point in the history
  • Loading branch information
samuel40791765 committed May 2, 2024
1 parent 0f199fc commit bc89b66
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
4 changes: 2 additions & 2 deletions tests/ci/cdk/cdk/codebuild/github_ci_integration_omnibus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ batch:

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

- identifier: mysql_integration_aarch
buildspec: tests/ci/codebuild/common/run_simple_target.yml
buildspec: tests/ci/codebuild/common/run_nonroot_target.yml
env:
type: ARM_CONTAINER
privileged-mode: false
Expand Down
13 changes: 6 additions & 7 deletions tests/ci/integration/run_mysql_integration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,6 @@ function mysql_run_tests() {
main.udf_bug35242734 : Bug#0000 mysqld is not managed by supervisor process
main.file_contents : Bug#0000 Cannot open 'INFO_SRC' in ''
main.resource_group_thr_prio_unsupported : Bug#0000 Invalid thread priority value -5
main.dd_upgrade_error_cs : Bug#0000 running mysqld as root
main.basedir : Bug#0000 running mysqld as root
main.lowercase_fs_off : Bug#0000 running mysqld as root
main.upgrade : Bug#0000 running mysqld as root
main.partition_prefixkey_upgrade : Bug#0000 running mysqld as root
main.mysqld_cmdline_warnings : Bug#0000 running mysqld as root
main.mysqld_daemon : Bug#0000 failed, error: 256, status: 1, errno: 2.
main.mysqld_safe : Bug#0000 nonexistent: No such file or directory
main.grant_user_lock : Bug#0000 Access denied for user root at localhost
Expand Down Expand Up @@ -127,7 +121,12 @@ mysql_patch_tests
mysql_patch_error_strings

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

popd

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

0 comments on commit bc89b66

Please sign in to comment.