Mesa (main): ci: move b2c artifacts to its own directory
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Jun 24 06:00:45 UTC 2022
Module: Mesa
Branch: main
Commit: fd2f529a6bca98f5949465ccff96f6ba13c955af
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fd2f529a6bca98f5949465ccff96f6ba13c955af
Author: Andres Gomez <agomez at igalia.com>
Date: Wed Jun 22 15:36:02 2022 +0300
ci: move b2c artifacts to its own directory
Signed-off-by: Andres Gomez <agomez at igalia.com>
Reviewed-by: Martin Roukala <martin.roukala at mupuf.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17184>
---
.gitlab-ci/{valve => b2c}/b2c.yml.jinja2.jinja2 | 0
.gitlab-ci/{valve => b2c}/generate_b2c.py | 0
.gitlab-ci/prepare-artifacts.sh | 2 +-
.gitlab-ci/test/gitlab-ci.yml | 8 ++++----
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci/valve/b2c.yml.jinja2.jinja2 b/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2
similarity index 100%
rename from .gitlab-ci/valve/b2c.yml.jinja2.jinja2
rename to .gitlab-ci/b2c/b2c.yml.jinja2.jinja2
diff --git a/.gitlab-ci/valve/generate_b2c.py b/.gitlab-ci/b2c/generate_b2c.py
similarity index 100%
rename from .gitlab-ci/valve/generate_b2c.py
rename to .gitlab-ci/b2c/generate_b2c.py
diff --git a/.gitlab-ci/prepare-artifacts.sh b/.gitlab-ci/prepare-artifacts.sh
index bb96de36a19..88611ed49a8 100755
--- a/.gitlab-ci/prepare-artifacts.sh
+++ b/.gitlab-ci/prepare-artifacts.sh
@@ -47,7 +47,7 @@ mkdir -p artifacts/
tar -cf artifacts/install.tar install
cp -Rp .gitlab-ci/common artifacts/ci-common
cp -Rp .gitlab-ci/lava artifacts/
-cp -Rp .gitlab-ci/valve artifacts/
+cp -Rp .gitlab-ci/b2c artifacts/
if [ -n "$MINIO_ARTIFACT_NAME" ]; then
# Pass needed files to the test stage
diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index 6e2b5d5212b..d892561006d 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -231,10 +231,10 @@
INSTALL_TARBALL_NAME: "install.tar"
INSTALL_TARBALL: "./artifacts/${INSTALL_TARBALL_NAME}"
- CI_VALVE_ARTIFACTS: "./artifacts/valve"
+ CI_B2C_ARTIFACTS: "./artifacts/b2c"
CI_COMMON_SCRIPTS: "./artifacts/ci-common"
GENERATE_ENV_SCRIPT: "${CI_COMMON_SCRIPTS}/generate-env.sh"
- B2C_JOB_TEMPLATE: "${CI_VALVE_ARTIFACTS}/b2c.yml.jinja2.jinja2"
+ B2C_JOB_TEMPLATE: "${CI_B2C_ARTIFACTS}/b2c.yml.jinja2.jinja2"
JOB_FOLDER: "job_folder"
before_script:
# We don't want the tarball unpacking of .test, but will take the JWT bits.
@@ -258,7 +258,7 @@
fi
[ -s "$INSTALL_TARBALL" ] || exit 1
- [ -d "$CI_VALVE_ARTIFACTS" ] || exit 1
+ [ -d "$CI_B2C_ARTIFACTS" ] || exit 1
[ -d "$CI_COMMON_SCRIPTS" ] || exit 1
@@ -266,7 +266,7 @@
# The Valve CI gateway receives jobs in a YAML format. Create a
# job description from the CI environment.
- python3 "$CI_VALVE_ARTIFACTS"/generate_b2c.py \
+ python3 "$CI_B2C_ARTIFACTS"/generate_b2c.py \
--ci-job-id "${CI_JOB_ID}" \
--container-cmd "${B2C_TEST_SCRIPT}" \
--initramfs-url "${B2C_INITRAMFS_URL}" \
More information about the mesa-commit
mailing list