From 667ed2a266d4f43933f3964918935fa01935c1a1 Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Thu, 19 Jun 2025 15:34:07 +0200 Subject: [PATCH] ci: remove `host_test` runner tag, use more precise build, shiny instead --- .gitlab/ci/build.yml | 5 +---- .gitlab/ci/deploy.yml | 2 +- .gitlab/ci/host-test.yml | 3 +-- .gitlab/ci/pre_check.yml | 3 +-- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml index 1c0c1d36bd..2c4ff9b938 100644 --- a/.gitlab/ci/build.yml +++ b/.gitlab/ci/build.yml @@ -3,10 +3,7 @@ extends: - .after_script:build:ccache-show-stats:upload-failed-job-logs image: $ESP_ENV_IMAGE - tags: - - build - # build only on shiny servers since shiny storage server is at the same location - - shiny + tags: [build, shiny] variables: # Enable ccache for all build jobs. See configure_ci_environment.sh for more ccache related settings. IDF_CCACHE_ENABLE: "1" diff --git a/.gitlab/ci/deploy.yml b/.gitlab/ci/deploy.yml index a149c440a2..53da24ff31 100644 --- a/.gitlab/ci/deploy.yml +++ b/.gitlab/ci/deploy.yml @@ -58,7 +58,7 @@ deploy_update_SHA_in_esp-dockerfiles: dependencies: [] variables: GIT_DEPTH: 2 - tags: [ shiny, build ] + tags: [build, shiny] script: - 'curl --header "PRIVATE-TOKEN: ${ESPCI_SCRIPTS_TOKEN}" -o create_MR_in_esp_dockerfile.sh $GITLAB_HTTP_SERVER/api/v4/projects/1260/repository/files/create_MR_in_esp_dockerfile%2Fcreate_MR_in_esp_dockerfile.sh/raw\?ref\=master' - chmod +x create_MR_in_esp_dockerfile.sh diff --git a/.gitlab/ci/host-test.yml b/.gitlab/ci/host-test.yml index c910ad5042..c3d364f7f3 100644 --- a/.gitlab/ci/host-test.yml +++ b/.gitlab/ci/host-test.yml @@ -2,8 +2,7 @@ extends: .rules:test:host_test stage: host_test image: $ESP_ENV_IMAGE - tags: - - host_test + tags: [build, shiny] dependencies: # set dependencies to null to avoid missing artifacts issue # run host_test jobs immediately, only after upload cache needs: diff --git a/.gitlab/ci/pre_check.yml b/.gitlab/ci/pre_check.yml index 1a9454698a..515b674ad0 100644 --- a/.gitlab/ci/pre_check.yml +++ b/.gitlab/ci/pre_check.yml @@ -1,8 +1,7 @@ .pre_check_template: stage: pre_check image: $ESP_ENV_IMAGE - tags: - - host_test + tags: [build, shiny] dependencies: # set dependencies to null to avoid missing artifacts issue check_version: