From 11f8dffec40916cc3417818bc6553c73c6bdaa87 Mon Sep 17 00:00:00 2001 From: Guilherme Gallo Date: Tue, 18 Feb 2025 13:43:09 -0300 Subject: [PATCH] ci/angle: remove USE_ANGLE variable Now that every ANGLE use is covered by tag consistency checks (structured tagging), we don't need the USE_ANGLE flag anymore, because if we have ANGLE_TAG set, it means that ANGLE is required in this job. In detail, it means that the test job has inherited ANGLE_TAG from `.container-builds-angle`. Signed-off-by: Guilherme Gallo Part-of: --- .gitlab-ci/common/export-gitlab-job-env-for-dut.sh | 1 - .gitlab-ci/cuttlefish-runner.sh | 8 ++++---- .gitlab-ci/deqp-runner.sh | 4 ++-- .gitlab-ci/test/gitlab-ci.yml | 6 ------ src/amd/ci/gitlab-ci.yml | 1 - src/freedreno/ci/gitlab-ci.yml | 3 --- src/intel/ci/gitlab-ci-inc.yml | 1 - 7 files changed, 6 insertions(+), 18 deletions(-) diff --git a/.gitlab-ci/common/export-gitlab-job-env-for-dut.sh b/.gitlab-ci/common/export-gitlab-job-env-for-dut.sh index cf3744f01ca..a57797bc789 100755 --- a/.gitlab-ci/common/export-gitlab-job-env-for-dut.sh +++ b/.gitlab-ci/common/export-gitlab-job-env-for-dut.sh @@ -123,7 +123,6 @@ VARS=( STORAGE_FORK_HOST_PATH STORAGE_MAINLINE_HOST_PATH TU_DEBUG - USE_ANGLE VIRGL_HOST_API VIRGL_RENDER_SERVER VK_DRIVER diff --git a/.gitlab-ci/cuttlefish-runner.sh b/.gitlab-ci/cuttlefish-runner.sh index 2ec601642d0..81731fc4894 100755 --- a/.gitlab-ci/cuttlefish-runner.sh +++ b/.gitlab-ci/cuttlefish-runner.sh @@ -8,7 +8,7 @@ section_start cuttlefish_setup "cuttlefish: setup" set -xe # Structured tagging check for angle -if [ -n "$USE_ANGLE" ]; then +if [ -n "$ANGLE_TAG" ]; then # Bail out if the ANGLE_TAG differs from what is offered in the system ci_tag_test_time_check "ANGLE_TAG" fi @@ -159,7 +159,7 @@ $ADB shell rm -f /vendor/lib64/egl/libEGL_angle.so $ADB shell rm -f /vendor/lib64/egl/libGLESv1_CM_angle.so $ADB shell rm -f /vendor/lib64/egl/libGLESv2_angle.so -if [ -n "$USE_ANGLE" ]; then +if [ -n "$ANGLE_TAG" ]; then $ADB push /angle/libEGL_angle.so /vendor/lib64/egl/libEGL_angle.so $ADB push /angle/libGLESv1_CM_angle.so /vendor/lib64/egl/libGLESv1_CM_angle.so $ADB push /angle/libGLESv2_angle.so /vendor/lib64/egl/libGLESv2_angle.so @@ -179,7 +179,7 @@ $ADB shell start while [ "$($ADB shell dumpsys SurfaceFlinger | grep GLES:)" = "" ] ; do sleep 1; done MESA_RUNTIME_VERSION="$($ADB shell dumpsys SurfaceFlinger | grep GLES:)" -if [ "$USE_ANGLE" = 1 ]; then +if [ -n "$ANGLE_TAG" ]; then ANGLE_HASH=$(head -c 12 /angle/version) if ! printf "%s" "$MESA_RUNTIME_VERSION" | grep --quiet "${ANGLE_HASH}"; then echo "Fatal: Android is loading a wrong version of the ANGLE libs: ${ANGLE_HASH}" 1>&2 @@ -205,7 +205,7 @@ if [ -e "$INSTALL/$GPU_VERSION-skips.txt" ]; then DEQP_SKIPS="$DEQP_SKIPS /data/deqp/$GPU_VERSION-skips.txt" fi -if [ -n "$USE_ANGLE" ]; then +if [ -n "$ANGLE_TAG" ]; then DEQP_SKIPS="$DEQP_SKIPS /data/deqp/angle-skips.txt" fi diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh index a6a9b03c060..a1e8ef87e29 100755 --- a/.gitlab-ci/deqp-runner.sh +++ b/.gitlab-ci/deqp-runner.sh @@ -25,7 +25,7 @@ ARCH=$(uname -m) export VK_DRIVER_FILES="$PWD"/install/share/vulkan/icd.d/"$VK_DRIVER"_icd."$ARCH".json export OCL_ICD_VENDORS="$PWD"/install/etc/OpenCL/vendors/ -if [ -n "$USE_ANGLE" ]; then +if [ -n "$ANGLE_TAG" ]; then # Are we using the right angle version? ci_tag_test_time_check "ANGLE_TAG" export LD_LIBRARY_PATH=/angle:$LD_LIBRARY_PATH @@ -77,7 +77,7 @@ if [ "$PIGLIT_PLATFORM" = "gbm" ]; then DEQP_SKIPS="$DEQP_SKIPS $INSTALL/gbm-skips.txt" fi -if [ -n "$USE_ANGLE" ]; then +if [ -n "$ANGLE_TAG" ]; then DEQP_SKIPS="$DEQP_SKIPS $INSTALL/angle-skips.txt" fi diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml index aceb4fc510b..0728d55b35f 100644 --- a/.gitlab-ci/test/gitlab-ci.yml +++ b/.gitlab-ci/test/gitlab-ci.yml @@ -182,12 +182,6 @@ yaml-toml-shell-py-test: variables: ANGLE_TAG: ${CONDITIONAL_BUILD_ANGLE_TAG} -.test-angle: - extends: - - .tag-check-angle - variables: - USE_ANGLE: 1 - .b2c-vkd3d-proton-test: variables: HWCI_TEST_SCRIPT: install/vkd3d-runner.sh diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml index f724b26dcc2..6b0f110e28e 100644 --- a/src/amd/ci/gitlab-ci.yml +++ b/src/amd/ci/gitlab-ci.yml @@ -18,7 +18,6 @@ radv-stoney-angle: - .test-angle variables: DEQP_SUITE: radv-stoney-angle - USE_ANGLE: 1 GPU_VERSION: angle-radv-stoney-aco DEQP_FRACTION: 3 diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml index e1ff4bf6ffa..3d58de0bde4 100644 --- a/src/freedreno/ci/gitlab-ci.yml +++ b/src/freedreno/ci/gitlab-ci.yml @@ -87,7 +87,6 @@ a618-angle: - .test-angle variables: DEQP_SUITE: tu-angle - USE_ANGLE: 1 a618-vk: extends: @@ -236,7 +235,6 @@ a660-angle: - .test-angle variables: DEQP_SUITE: tu-angle - USE_ANGLE: 1 a660-piglit-cl: extends: @@ -425,7 +423,6 @@ a750-angle: - .test-angle timeout: 25m # base runtime 10min total, 7min of testing variables: - USE_ANGLE: 1 B2C_TIMEOUT_BOOT_MINUTES: 17 B2C_TIMEOUT_OVERALL_MINUTES: 20 DEQP_SUITE: tu-angle diff --git a/src/intel/ci/gitlab-ci-inc.yml b/src/intel/ci/gitlab-ci-inc.yml index e030c5c2dfa..87c7b8c1b54 100644 --- a/src/intel/ci/gitlab-ci-inc.yml +++ b/src/intel/ci/gitlab-ci-inc.yml @@ -373,7 +373,6 @@ - .test-angle variables: VK_DRIVER: intel - USE_ANGLE: 1 ## Iris only .iris-apl-test: