ci: rename FORCE_KERNEL_TAG to EXTERNAL_KERNEL_TAG

FORCE_KERNEL_TAG allows testing kernel uprevs without rebuilding containers by supplying an external kernel directly for booting on hardware devices. Renaming it to EXTERNAL_KERNEL_TAG clarifies its purpose, distinguishing it from KERNEL_TAG which rebuilds containers. Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31795>
2024-11-23 02:04:41 +08:00 · 2024-10-23 11:20:09 +05:30 · 2024-10-23 11:20:09 +05:30 · c3531d5fea
commit c3531d5fea
parent f47c692d99
13 changed files with 22 additions and 22 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -101,7 +101,7 @@ default:
  before_script:
    - |
      if [ -z "${KERNEL_IMAGE_BASE:-}" ]; then
-        export KERNEL_IMAGE_BASE="https://${S3_HOST}/${S3_KERNEL_BUCKET}/${KERNEL_REPO}/${FORCE_KERNEL_TAG:-$KERNEL_TAG}"
+        export KERNEL_IMAGE_BASE="https://${S3_HOST}/${S3_KERNEL_BUCKET}/${KERNEL_REPO}/${EXTERNAL_KERNEL_TAG:-$KERNEL_TAG}"
      fi
    - >
      export SCRIPTS_DIR=$(mktemp -d) &&
--- a/.gitlab-ci/bare-metal/cros-servo.sh
+++ b/.gitlab-ci/bare-metal/cros-servo.sh
@ -90,7 +90,7 @@ rm -rf /tftp/*
 if echo "$BM_KERNEL" | grep -q http; then
  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
      $BM_KERNEL -o /tftp/vmlinuz
-elif [ -n "${FORCE_KERNEL_TAG}" ]; then
+elif [ -n "${EXTERNAL_KERNEL_TAG}" ]; then
  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
    "${FDO_HTTP_CACHE_URI:-}${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/${BM_KERNEL}" -o /tftp/vmlinuz
  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
--- a/.gitlab-ci/bare-metal/fastboot.sh
+++ b/.gitlab-ci/bare-metal/fastboot.sh
@ -107,7 +107,7 @@ if echo "$BM_KERNEL $BM_DTB" | grep -q http; then

  cat kernel dtb > Image.gz-dtb

-elif [ -n "${FORCE_KERNEL_TAG}" ]; then
+elif [ -n "${EXTERNAL_KERNEL_TAG}" ]; then
  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
      "${FDO_HTTP_CACHE_URI:-}${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/${BM_KERNEL}" -o kernel
  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
--- a/.gitlab-ci/bare-metal/poe-powered.sh
+++ b/.gitlab-ci/bare-metal/poe-powered.sh
@ -104,7 +104,7 @@ if [ -f "${BM_BOOTFS}" ]; then
 fi

 # If BM_KERNEL and BM_DTS is present
-if [ -n "${FORCE_KERNEL_TAG}" ]; then
+if [ -n "${EXTERNAL_KERNEL_TAG}" ]; then
  if [ -z "${BM_KERNEL}" ] || [ -z "${BM_DTB}" ]; then
    echo "This machine cannot be tested with external kernel since BM_KERNEL or BM_DTB missing!"
    exit 1
@ -122,7 +122,7 @@ date +'%F %T'

 # Install kernel modules (it could be either in /lib/modules or
 # /usr/lib/modules, but we want to install in the latter)
-if [ -n "${FORCE_KERNEL_TAG}" ]; then
+if [ -n "${EXTERNAL_KERNEL_TAG}" ]; then
  tar --keep-directory-symlink --zstd -xf modules.tar.zst -C /nfs/
  rm modules.tar.zst &
 elif [ -n "${BM_BOOTFS}" ]; then
@ -136,7 +136,7 @@ fi
 date +'%F %T'

 # Install kernel image + bootloader files
-if [ -n "${FORCE_KERNEL_TAG}" ] || [ -z "$BM_BOOTFS" ]; then
+if [ -n "${EXTERNAL_KERNEL_TAG}" ] || [ -z "$BM_BOOTFS" ]; then
  mv "${BM_KERNEL}" "${BM_DTB}.dtb" /tftp/
 else  # BM_BOOTFS
  rsync -aL --delete $BM_BOOTFS/boot/ /tftp/
--- a/.gitlab-ci/lava/lava-submit.sh
+++ b/.gitlab-ci/lava/lava-submit.sh
@ -49,7 +49,7 @@ PYTHONPATH=artifacts/ artifacts/lava/lava_job_submitter.py \
 	--pipeline-info "$CI_JOB_NAME: $CI_PIPELINE_URL on $CI_COMMIT_REF_NAME ${CI_NODE_INDEX}/${CI_NODE_TOTAL}" \
 	--rootfs-url-prefix "https://${BASE_SYSTEM_HOST_PATH}" \
 	--kernel-url-prefix "${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}" \
-	--kernel-external "${FORCE_KERNEL_TAG}" \
+	--kernel-external "${EXTERNAL_KERNEL_TAG}" \
 	--build-url "${ARTIFACT_URL}" \
 	--job-rootfs-overlay-url "${LAVA_HTTP_CACHE_URI:-}https://${JOB_ROOTFS_OVERLAY_PATH}" \
 	--job-timeout-min ${JOB_TIMEOUT:-30} \
--- a/src/broadcom/ci/gitlab-ci-inc.yml
+++ b/src/broadcom/ci/gitlab-ci-inc.yml
@ -29,7 +29,7 @@
 .vc4-rules:
  stage: broadcom
  rules:
-    - if: $FORCE_KERNEL_TAG != null
+    - if: $EXTERNAL_KERNEL_TAG != null
      when: never
    - !reference [.test, rules]
    - !reference [.igalia-farm-rules, rules]
@ -56,7 +56,7 @@
 .v3d-rules:
  stage: broadcom
  rules:
-    - if: $FORCE_KERNEL_TAG != null
+    - if: $EXTERNAL_KERNEL_TAG != null
      when: never
    - !reference [.test, rules]
    - !reference [.igalia-farm-rules, rules]
@ -97,7 +97,7 @@
 .v3dv-rules:
  stage: broadcom
  rules:
-    - if: $FORCE_KERNEL_TAG != null
+    - if: $EXTERNAL_KERNEL_TAG != null
      when: never
    - !reference [.test, rules]
    - !reference [.igalia-farm-rules, rules]
--- a/src/freedreno/ci/gitlab-ci-inc.yml
+++ b/src/freedreno/ci/gitlab-ci-inc.yml
@ -236,7 +236,7 @@
    RUNNER_TAG: mesa-ci-x86-64-lava-sc7180-trogdor-kingoftown
    VK_DRIVER: freedreno
    # force fixed kernel until 6.11 is switched officially
-    FORCE_KERNEL_TAG: "v6.11-rc7-mesa-c984"
+    EXTERNAL_KERNEL_TAG: "v6.11-rc7-mesa-c984"

 # Status: https://lava.collabora.dev/scheduler/device_type/sc7180-trogdor-lazor-limozeen
 .lava-sc7180-trogdor-lazor-limozeen:arm64:
@ -254,7 +254,7 @@
    RUNNER_TAG: mesa-ci-x86-64-lava-sc7180-trogdor-lazor-limozeen
    VK_DRIVER: freedreno
    # force fixed kernel until 6.11 is switched officially
-    FORCE_KERNEL_TAG: "v6.11-rc7-mesa-c984"
+    EXTERNAL_KERNEL_TAG: "v6.11-rc7-mesa-c984"

 # Status: https://lava.collabora.dev/scheduler/device_type/sm8350-hdk
 .lava-sm8350-hdk:arm64:
@ -273,7 +273,7 @@
    RUNNER_TAG: mesa-ci-x86-64-lava-sm8350-hdk
    VK_DRIVER: freedreno
    # force fixed kernel until 6.11 is switched officially
-    FORCE_KERNEL_TAG: "v6.11-rc7-mesa-c984"
+    EXTERNAL_KERNEL_TAG: "v6.11-rc7-mesa-c984"


 .google-freedreno-test:
@ -287,7 +287,7 @@
    BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8 $BM_KERNEL_EXTRA_ARGS root=/dev/nfs rw nfsrootdebug nfsroot=,tcp,nfsvers=4.2 init=/init $BM_KERNELARGS"
    FARM: google
    # force fixed kernel until 6.11 is switched officially
-    FORCE_KERNEL_TAG: "v6.11-rc7-mesa-c984"
+    EXTERNAL_KERNEL_TAG: "v6.11-rc7-mesa-c984"
  script:
    - ./install/bare-metal/fastboot.sh

--- a/src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml
+++ b/src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml
@ -2,7 +2,7 @@
  stage: software-renderer
  rules:
    - !reference [.test, rules]
-    - if: $FORCE_KERNEL_TAG != null
+    - if: $EXTERNAL_KERNEL_TAG != null
      when: never
    - !reference [.gl-rules, rules]
    - changes: &llvmpipe_file_list
--- a/src/gallium/drivers/softpipe/ci/gitlab-ci-inc.yml
+++ b/src/gallium/drivers/softpipe/ci/gitlab-ci-inc.yml
@ -2,7 +2,7 @@
  stage: software-renderer
  rules:
    - !reference [.test, rules]
-    - if: $FORCE_KERNEL_TAG != null
+    - if: $EXTERNAL_KERNEL_TAG != null
      when: never
    - !reference [.gl-rules, rules]
    - changes: &softpipe_file_list
--- a/src/gallium/drivers/svga/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/svga/ci/gitlab-ci.yml
@ -37,5 +37,5 @@ vmware-vmx-piglit:x86_64:
    DEVICE_TYPE: x86
    BOOT_METHOD: ipxe
    KERNEL_REPO: "blu/linux"
-    FORCE_KERNEL_TAG: "a49175f6c"
-    KERNEL_IMAGE_BASE: "https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${FORCE_KERNEL_TAG}"
+    EXTERNAL_KERNEL_TAG: "a49175f6c"
+    KERNEL_IMAGE_BASE: "https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${EXTERNAL_KERNEL_TAG}"
--- a/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml
+++ b/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml
@ -2,7 +2,7 @@
  stage: layered-backends
  rules:
    - !reference [.test, rules]
-    - if: $FORCE_KERNEL_TAG != null
+    - if: $EXTERNAL_KERNEL_TAG != null
      when: never
    - !reference [.gl-rules, rules]
    - !reference [.llvmpipe-rules, rules]
--- a/src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml
+++ b/src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml
@ -2,7 +2,7 @@
  stage: software-renderer
  rules:
    - !reference [.test, rules]
-    - if: $FORCE_KERNEL_TAG != null
+    - if: $EXTERNAL_KERNEL_TAG != null
      when: never
    - !reference [.vulkan-rules, rules]
    - !reference [.gallium-core-rules, rules]
--- a/src/panfrost/ci/gitlab-ci.yml
+++ b/src/panfrost/ci/gitlab-ci.yml
@ -229,7 +229,7 @@
    BOOT_METHOD: u-boot
    KERNEL_IMAGE_NAME: Image
    KERNEL_IMAGE_TYPE: "image"
-    FORCE_KERNEL_TAG: "v6.11-rc7-mesa-f9e9"
+    EXTERNAL_KERNEL_TAG: "v6.11-rc7-mesa-f9e9"
    RUNNER_TAG: mesa-ci-x86-64-lava-rk3588-rock-5b

 # Status: https://lava.collabora.dev/scheduler/device_type/sun50i-h6-pine-h64
@ -314,7 +314,7 @@ panfrost-t860-traces:arm64:
    - .panfrost-traces
  variables:
    # force fixed kernel until 6.11 is switched officially
-    FORCE_KERNEL_TAG: "v6.11-rc7-mesa-3fb8"
+    EXTERNAL_KERNEL_TAG: "v6.11-rc7-mesa-3fb8"


 panfrost-g52-gl:arm64: