From 6394cdde6c70822c11fcdb389dd88237b8e45476 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Fri, 28 Feb 2025 19:34:57 +0100 Subject: [PATCH] ci/b2c: split B2C_JOB_VOLUME_EXCLUSIONS in the jinja template Part-of: --- .gitlab-ci/b2c/b2c.yml.jinja2.jinja2 | 2 +- .gitlab-ci/b2c/generate_b2c.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 b/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 index e5c39796bbc..e6c4595c53c 100644 --- a/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 +++ b/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 @@ -103,7 +103,7 @@ deployment: data: > b2c.pipefail b2c.poweroff_delay={{ poweroff_delay }} b2c.minio="gateway,{{ '{{' }} minio_url }},{{ '{{' }} job_bucket_access_key }},{{ '{{' }} job_bucket_secret_key }}" - b2c.volume="{{ '{{' }} job_bucket }}-results,mirror=gateway/{{ '{{' }} job_bucket }},pull_on=pipeline_start,push_on=changes,overwrite{% for excl in job_volume_exclusions %},exclude={{ excl }}{% endfor %},remove,expiration=pipeline_end,preserve" + b2c.volume="{{ '{{' }} job_bucket }}-results,mirror=gateway/{{ '{{' }} job_bucket }},pull_on=pipeline_start,push_on=changes,overwrite{% for excl in job_volume_exclusions.split(',') %},exclude={{ excl }}{% endfor %},remove,expiration=pipeline_end,preserve" {% for volume in volumes %} b2c.volume={{ volume }} {% endfor %} diff --git a/.gitlab-ci/b2c/generate_b2c.py b/.gitlab-ci/b2c/generate_b2c.py index a18d3454f7e..d810668fc49 100755 --- a/.gitlab-ci/b2c/generate_b2c.py +++ b/.gitlab-ci/b2c/generate_b2c.py @@ -38,7 +38,6 @@ template = env.get_template(path.basename(environ['B2C_JOB_TEMPLATE'])) values['ci_job_id'] = environ['CI_JOB_ID'] values['ci_runner_description'] = environ['CI_RUNNER_DESCRIPTION'] -values['job_volume_exclusions'] = [excl for excl in values['job_volume_exclusions'].split(",") if excl] values['working_dir'] = environ['CI_PROJECT_DIR'] values['image_under_test'] = environ['IMAGE_UNDER_TEST']