[libvirt PATCH 20/20] gitlab-ci.yml: Drop the usage of script variables reference

Erik Skultety eskultet at redhat.com
Mon Feb 6 13:53:17 UTC 2023


ci/build.sh is already exporting all of those and there's no need for
these variables to necessarily be defined and exported by GitLab
explicitly, this can be transparent to the job definition plus it keeps
everything important in a single place.

Signed-off-by: Erik Skultety <eskultet at redhat.com>
---
 .gitlab-ci.yml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 747209dca9..7cbccb5fe6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,14 +7,6 @@ stages:
   - integration_tests
   - sanity_checks
 
-.script_variables: &script_variables |
-  export CCACHE_BASEDIR="$(pwd)"
-  export CCACHE_DIR="$CCACHE_BASEDIR/ccache"
-  export CCACHE_MAXSIZE="500M"
-  export PATH="$CCACHE_WRAPPERSDIR:$PATH"
-  export VIR_TEST_VERBOSE="1"
-  export VIR_TEST_DEBUG="1"
-
 include:
   - '/ci/gitlab.yml'
   - '/ci/integration.yml'
@@ -25,7 +17,6 @@ include:
       - ccache/
     key: "$CI_JOB_NAME"
   script:
-    - *script_variables
     - if test -x /usr/bin/rpmbuild && test "$RPM" != "skip";
       then
          ci/build.sh --rpmbuild;
@@ -57,7 +48,6 @@ include:
       - ccache/
     key: "$CI_JOB_NAME"
   script:
-    - *script_variables
     - ci/build.sh --build
     - if test "$CROSS" = "i686" ;
       then
@@ -83,7 +73,6 @@ include:
 #    https://gitlab.com/libvirt/libvirt/-/jobs/artifacts/master/download?job=website
 .website_job:
   script:
-    - *script_variables
     - ci/build.sh --website
   after_script:
     - test "$CI_JOB_STATUS" != "success" && exit 1;
@@ -118,7 +107,6 @@ website_local_env:
 .codestyle_job:
   stage: sanity_checks
   script:
-    - *script_variables
     - ci/build.sh --codestyle
 
 codestyle_prebuilt_env:
@@ -157,8 +145,6 @@ potfile:
     - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
       when: on_success
     - when: never
-  before_script:
-    - *script_variables
   script:
     - ci/build.sh --potfile
   after_script:
-- 
2.39.1



More information about the libvir-list mailing list