From a86449cb969679ddda050d4eefb8a5ed21444aec Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Thu, 10 Jun 2021 10:50:44 +0100 Subject: [PATCH] ci/bare-metal: Factor out environment to a separate script This will let us reuse the same environment generation for both bare-metal and LAVA. Signed-off-by: Daniel Stone Part-of: --- .gitlab-ci/bare-metal/cros-servo.sh | 1 + .gitlab-ci/bare-metal/fastboot.sh | 1 + .gitlab-ci/bare-metal/poe-powered.sh | 1 + .gitlab-ci/bare-metal/rootfs-setup.sh | 73 +-------------------------- .gitlab-ci/common/generate-env.sh | 73 +++++++++++++++++++++++++++ 5 files changed, 77 insertions(+), 72 deletions(-) create mode 100755 .gitlab-ci/common/generate-env.sh diff --git a/.gitlab-ci/bare-metal/cros-servo.sh b/.gitlab-ci/bare-metal/cros-servo.sh index dbfa20456a6..53fbc817666 100755 --- a/.gitlab-ci/bare-metal/cros-servo.sh +++ b/.gitlab-ci/bare-metal/cros-servo.sh @@ -5,6 +5,7 @@ # We're run from the root of the repo, make a helper var for our paths BM=$CI_PROJECT_DIR/install/bare-metal +CI_COMMON=$CI_PROJECT_DIR/install/common # Runner config checks if [ -z "$BM_SERIAL" ]; then diff --git a/.gitlab-ci/bare-metal/fastboot.sh b/.gitlab-ci/bare-metal/fastboot.sh index ae44ba3e58b..908c5b264ec 100755 --- a/.gitlab-ci/bare-metal/fastboot.sh +++ b/.gitlab-ci/bare-metal/fastboot.sh @@ -1,6 +1,7 @@ #!/bin/bash BM=$CI_PROJECT_DIR/install/bare-metal +CI_COMMON=$CI_PROJECT_DIR/install/common if [ -z "$BM_SERIAL" -a -z "$BM_SERIAL_SCRIPT" ]; then echo "Must set BM_SERIAL OR BM_SERIAL_SCRIPT in your gitlab-runner config.toml [[runners]] environment" diff --git a/.gitlab-ci/bare-metal/poe-powered.sh b/.gitlab-ci/bare-metal/poe-powered.sh index 1872ab132de..3dd7330cd92 100755 --- a/.gitlab-ci/bare-metal/poe-powered.sh +++ b/.gitlab-ci/bare-metal/poe-powered.sh @@ -5,6 +5,7 @@ # We're run from the root of the repo, make a helper var for our paths BM=$CI_PROJECT_DIR/install/bare-metal +CI_COMMON=$CI_PROJECT_DIR/install/common # Runner config checks if [ -z "$BM_SERIAL" ]; then diff --git a/.gitlab-ci/bare-metal/rootfs-setup.sh b/.gitlab-ci/bare-metal/rootfs-setup.sh index d94c6e9a534..2e4280bac21 100644 --- a/.gitlab-ci/bare-metal/rootfs-setup.sh +++ b/.gitlab-ci/bare-metal/rootfs-setup.sh @@ -11,79 +11,8 @@ cp $BM/capture-devcoredump.sh $rootfs_dst/ set +x # Pass through relevant env vars from the gitlab job to the baremetal init script -touch $rootfs_dst/set-job-env-vars.sh +"$CI_COMMON"/generate-env.sh > $rootfs_dst/set-job-env-vars.sh chmod +x $rootfs_dst/set-job-env-vars.sh -for var in \ - ASAN_OPTIONS \ - BARE_METAL_TEST_SCRIPT \ - BM_KERNEL_MODULES \ - BM_START_XORG \ - CI_COMMIT_BRANCH \ - CI_COMMIT_TITLE \ - CI_JOB_ID \ - CI_JOB_JWT \ - CI_JOB_URL \ - CI_MERGE_REQUEST_SOURCE_BRANCH_NAME \ - CI_MERGE_REQUEST_TITLE \ - CI_NODE_INDEX \ - CI_NODE_TOTAL \ - CI_PAGES_DOMAIN \ - CI_PIPELINE_ID \ - CI_PROJECT_NAME \ - CI_PROJECT_PATH \ - CI_PROJECT_ROOT_NAMESPACE \ - CI_RUNNER_DESCRIPTION \ - CI_SERVER_URL \ - DEQP_CASELIST_FILTER \ - DEQP_CASELIST_INV_FILTER \ - DEQP_CONFIG \ - DEQP_EXPECTED_RENDERER \ - DEQP_FRACTION \ - DEQP_HEIGHT \ - DEQP_NO_SAVE_RESULTS \ - DEQP_PARALLEL \ - DEQP_RESULTS_DIR \ - DEQP_RUNNER_OPTIONS \ - DEQP_VARIANT \ - DEQP_VER \ - DEQP_WIDTH \ - DEVICE_NAME \ - DRIVER_NAME \ - EGL_PLATFORM \ - FDO_CI_CONCURRENT \ - FDO_UPSTREAM_REPO \ - FD_MESA_DEBUG \ - FLAKES_CHANNEL \ - GPU_VERSION \ - IR3_SHADER_DEBUG \ - MESA_GL_VERSION_OVERRIDE \ - MESA_GLSL_VERSION_OVERRIDE \ - MESA_GLES_VERSION_OVERRIDE \ - MINIO_HOST \ - NIR_VALIDATE \ - PIGLIT_FRACTION \ - PIGLIT_JUNIT_RESULTS \ - PIGLIT_OPTIONS \ - PIGLIT_PLATFORM \ - PIGLIT_PROFILES \ - PIGLIT_REPLAY_ARTIFACTS_BASE_URL \ - PIGLIT_REPLAY_SUBCOMMAND \ - PIGLIT_REPLAY_DESCRIPTION_FILE \ - PIGLIT_REPLAY_DEVICE_NAME \ - PIGLIT_REPLAY_EXTRA_ARGS \ - PIGLIT_REPLAY_REFERENCE_IMAGES_BASE_URL \ - PIGLIT_REPLAY_UPLOAD_TO_MINIO \ - PIGLIT_RESULTS \ - PIGLIT_TESTS \ - TEST_LD_PRELOAD \ - TU_DEBUG \ - VK_CPU \ - VK_DRIVER \ - ; do - if [ -n "${!var+x}" ]; then - echo "export $var=${!var@Q}" >> $rootfs_dst/set-job-env-vars.sh - fi -done echo "Variables passed through:" cat $rootfs_dst/set-job-env-vars.sh set -x diff --git a/.gitlab-ci/common/generate-env.sh b/.gitlab-ci/common/generate-env.sh new file mode 100755 index 00000000000..41946cc13a8 --- /dev/null +++ b/.gitlab-ci/common/generate-env.sh @@ -0,0 +1,73 @@ +#!/bin/bash + +for var in \ + ASAN_OPTIONS \ + BARE_METAL_TEST_SCRIPT \ + BM_KERNEL_MODULES \ + BM_START_XORG \ + CI_COMMIT_BRANCH \ + CI_COMMIT_TITLE \ + CI_JOB_ID \ + CI_JOB_JWT \ + CI_JOB_URL \ + CI_MERGE_REQUEST_SOURCE_BRANCH_NAME \ + CI_MERGE_REQUEST_TITLE \ + CI_NODE_INDEX \ + CI_NODE_TOTAL \ + CI_PAGES_DOMAIN \ + CI_PIPELINE_ID \ + CI_PROJECT_NAME \ + CI_PROJECT_PATH \ + CI_PROJECT_ROOT_NAMESPACE \ + CI_RUNNER_DESCRIPTION \ + CI_SERVER_URL \ + DEQP_CASELIST_FILTER \ + DEQP_CASELIST_INV_FILTER \ + DEQP_CONFIG \ + DEQP_EXPECTED_RENDERER \ + DEQP_FRACTION \ + DEQP_HEIGHT \ + DEQP_NO_SAVE_RESULTS \ + DEQP_PARALLEL \ + DEQP_RESULTS_DIR \ + DEQP_RUNNER_OPTIONS \ + DEQP_VARIANT \ + DEQP_VER \ + DEQP_WIDTH \ + DEVICE_NAME \ + DRIVER_NAME \ + EGL_PLATFORM \ + FDO_CI_CONCURRENT \ + FDO_UPSTREAM_REPO \ + FD_MESA_DEBUG \ + FLAKES_CHANNEL \ + GPU_VERSION \ + IR3_SHADER_DEBUG \ + MESA_GL_VERSION_OVERRIDE \ + MESA_GLSL_VERSION_OVERRIDE \ + MESA_GLES_VERSION_OVERRIDE \ + MINIO_HOST \ + NIR_VALIDATE \ + PIGLIT_FRACTION \ + PIGLIT_JUNIT_RESULTS \ + PIGLIT_OPTIONS \ + PIGLIT_PLATFORM \ + PIGLIT_PROFILES \ + PIGLIT_REPLAY_ARTIFACTS_BASE_URL \ + PIGLIT_REPLAY_SUBCOMMAND \ + PIGLIT_REPLAY_DESCRIPTION_FILE \ + PIGLIT_REPLAY_DEVICE_NAME \ + PIGLIT_REPLAY_EXTRA_ARGS \ + PIGLIT_REPLAY_REFERENCE_IMAGES_BASE_URL \ + PIGLIT_REPLAY_UPLOAD_TO_MINIO \ + PIGLIT_RESULTS \ + PIGLIT_TESTS \ + TEST_LD_PRELOAD \ + TU_DEBUG \ + VK_CPU \ + VK_DRIVER \ + ; do + if [ -n "${!var+x}" ]; then + echo "export $var=${!var@Q}" + fi +done