ci: move b2c artifacts to its own directory
Signed-off-by: Andres Gomez <agomez@igalia.com> Reviewed-by: Martin Roukala <martin.roukala@mupuf.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17184>
This commit is contained in:
parent
cec48994cc
commit
fd2f529a6b
|
@ -47,7 +47,7 @@ mkdir -p artifacts/
|
||||||
tar -cf artifacts/install.tar install
|
tar -cf artifacts/install.tar install
|
||||||
cp -Rp .gitlab-ci/common artifacts/ci-common
|
cp -Rp .gitlab-ci/common artifacts/ci-common
|
||||||
cp -Rp .gitlab-ci/lava artifacts/
|
cp -Rp .gitlab-ci/lava artifacts/
|
||||||
cp -Rp .gitlab-ci/valve artifacts/
|
cp -Rp .gitlab-ci/b2c artifacts/
|
||||||
|
|
||||||
if [ -n "$MINIO_ARTIFACT_NAME" ]; then
|
if [ -n "$MINIO_ARTIFACT_NAME" ]; then
|
||||||
# Pass needed files to the test stage
|
# Pass needed files to the test stage
|
||||||
|
|
|
@ -231,10 +231,10 @@
|
||||||
|
|
||||||
INSTALL_TARBALL_NAME: "install.tar"
|
INSTALL_TARBALL_NAME: "install.tar"
|
||||||
INSTALL_TARBALL: "./artifacts/${INSTALL_TARBALL_NAME}"
|
INSTALL_TARBALL: "./artifacts/${INSTALL_TARBALL_NAME}"
|
||||||
CI_VALVE_ARTIFACTS: "./artifacts/valve"
|
CI_B2C_ARTIFACTS: "./artifacts/b2c"
|
||||||
CI_COMMON_SCRIPTS: "./artifacts/ci-common"
|
CI_COMMON_SCRIPTS: "./artifacts/ci-common"
|
||||||
GENERATE_ENV_SCRIPT: "${CI_COMMON_SCRIPTS}/generate-env.sh"
|
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"
|
JOB_FOLDER: "job_folder"
|
||||||
before_script:
|
before_script:
|
||||||
# We don't want the tarball unpacking of .test, but will take the JWT bits.
|
# We don't want the tarball unpacking of .test, but will take the JWT bits.
|
||||||
|
@ -258,7 +258,7 @@
|
||||||
fi
|
fi
|
||||||
|
|
||||||
[ -s "$INSTALL_TARBALL" ] || exit 1
|
[ -s "$INSTALL_TARBALL" ] || exit 1
|
||||||
[ -d "$CI_VALVE_ARTIFACTS" ] || exit 1
|
[ -d "$CI_B2C_ARTIFACTS" ] || exit 1
|
||||||
[ -d "$CI_COMMON_SCRIPTS" ] || exit 1
|
[ -d "$CI_COMMON_SCRIPTS" ] || exit 1
|
||||||
|
|
||||||
|
|
||||||
|
@ -266,7 +266,7 @@
|
||||||
|
|
||||||
# The Valve CI gateway receives jobs in a YAML format. Create a
|
# The Valve CI gateway receives jobs in a YAML format. Create a
|
||||||
# job description from the CI environment.
|
# 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}" \
|
--ci-job-id "${CI_JOB_ID}" \
|
||||||
--container-cmd "${B2C_TEST_SCRIPT}" \
|
--container-cmd "${B2C_TEST_SCRIPT}" \
|
||||||
--initramfs-url "${B2C_INITRAMFS_URL}" \
|
--initramfs-url "${B2C_INITRAMFS_URL}" \
|
||||||
|
|
Loading…
Reference in New Issue