diff options
| author | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2022-09-08 07:44:38 +0200 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2022-09-08 12:07:19 +0000 |
| commit | 3601c28690c12b785338a2b73e68d637215d87ad (patch) | |
| tree | 8468ce1fc1ec0a6534bb34bf0e52ff3ddf3a9f7b /.gitlab-ci | |
| parent | 7dc8a78001b3292c0632263d098513ff4960a081 (diff) | |
| download | mesa-3601c28690c12b785338a2b73e68d637215d87ad.tar.gz mesa-3601c28690c12b785338a2b73e68d637215d87ad.tar.bz2 mesa-3601c28690c12b785338a2b73e68d637215d87ad.zip | |
ci: Stop explicitly passing env vars to FDO_DISTRIBUTION_EXEC command
ci-templates will now pass all env vars to the command.
Reviewed-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18467>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/container/gitlab-ci.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml index 6d0e6cdf700..7fb91203628 100644 --- a/.gitlab-ci/container/gitlab-ci.yml +++ b/.gitlab-ci/container/gitlab-ci.yml @@ -53,7 +53,7 @@ variables: FDO_DISTRIBUTION_VERSION: bullseye-slim FDO_REPO_SUFFIX: $CI_JOB_NAME - FDO_DISTRIBUTION_EXEC: 'env "WINEPATH=${WINEPATH}" FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh' + FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/container/${CI_JOB_NAME}.sh' # no need to pull the whole repo to build the container image GIT_STRATEGY: none @@ -189,7 +189,6 @@ debian/android_build: debian/x86_test-base: extends: debian/x86_build-base variables: - FDO_DISTRIBUTION_EXEC: 'env KERNEL_URL=${KERNEL_URL} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh' KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.17-for-mesa-ci-b78f7870d97b/linux-v5.17-for-mesa-ci-b78f7870d97b.tar.bz2" MESA_IMAGE_TAG: &debian-x86_test-base ${DEBIAN_BASE_TAG} @@ -333,8 +332,9 @@ debian/arm_test: - kernel+rootfs_arm64 - kernel+rootfs_armhf variables: - FDO_DISTRIBUTION_EXEC: 'env ARTIFACTS_PREFIX=https://${MINIO_HOST}/mesa-lava ARTIFACTS_SUFFIX=${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT} CI_PROJECT_PATH=${CI_PROJECT_PATH} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} FDO_UPSTREAM_REPO=${FDO_UPSTREAM_REPO} bash .gitlab-ci/container/${CI_JOB_NAME}.sh' FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}" + ARTIFACTS_PREFIX: "https://${MINIO_HOST}/mesa-lava" + ARTIFACTS_SUFFIX: "${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}" MESA_ARM_BUILD_TAG: *debian-arm_build MESA_IMAGE_TAG: &debian-arm_test ${DEBIAN_BASE_TAG} MESA_ROOTFS_TAG: *kernel-rootfs |