diff options
author | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2021-01-27 16:38:01 +0100 |
---|---|---|
committer | Marge Bot <eric+marge@anholt.net> | 2021-02-08 14:19:06 +0000 |
commit | e8246ad5f4f4cd08fffddd86862febc3bc4a78f9 (patch) | |
tree | d2bbc8795ce2638971a27af3efa3163b80f1b33a /.gitlab-ci | |
parent | a4cb96d12b38c663533f135ae4259d8bd56f6a75 (diff) |
ci: Move container files into their own dir
To be more consistent and to declutter the .gitlab-ci dir.
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Acked-by: Eric Anholt <eric@anholt.net>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
Reviewed-by: Andres Gomez <agomez@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8757>
Diffstat (limited to '.gitlab-ci')
-rw-r--r-- | .gitlab-ci/container/android_build.sh | 10 | ||||
-rw-r--r-- | .gitlab-ci/container/arm.config (renamed from .gitlab-ci/arm.config) | 0 | ||||
-rw-r--r-- | .gitlab-ci/container/arm64.config (renamed from .gitlab-ci/arm64.config) | 0 | ||||
-rw-r--r-- | .gitlab-ci/container/arm_build.sh | 2 | ||||
-rw-r--r-- | .gitlab-ci/container/baremetal_build.sh | 2 | ||||
-rw-r--r-- | .gitlab-ci/container/build-apitrace.sh (renamed from .gitlab-ci/build-apitrace.sh) | 0 | ||||
-rw-r--r-- | .gitlab-ci/container/build-deqp-runner.sh (renamed from .gitlab-ci/build-deqp-runner.sh) | 0 | ||||
-rw-r--r-- | .gitlab-ci/container/build-deqp.sh (renamed from .gitlab-ci/build-deqp.sh) | 0 | ||||
-rw-r--r-- | .gitlab-ci/container/build-fossilize.sh (renamed from .gitlab-ci/build-fossilize.sh) | 0 | ||||
-rw-r--r-- | .gitlab-ci/container/build-gfxreconstruct.sh (renamed from .gitlab-ci/build-gfxreconstruct.sh) | 0 | ||||
-rw-r--r-- | .gitlab-ci/container/build-libclc.sh (renamed from .gitlab-ci/build-libclc.sh) | 0 | ||||
-rw-r--r-- | .gitlab-ci/container/build-libdrm.sh (renamed from .gitlab-ci/build-libdrm.sh) | 0 | ||||
-rw-r--r-- | .gitlab-ci/container/build-piglit.sh (renamed from .gitlab-ci/build-piglit.sh) | 0 | ||||
-rw-r--r-- | .gitlab-ci/container/build-renderdoc.sh (renamed from .gitlab-ci/build-renderdoc.sh) | 0 | ||||
-rw-r--r-- | .gitlab-ci/container/build-rust.sh (renamed from .gitlab-ci/build-rust.sh) | 0 | ||||
-rw-r--r-- | .gitlab-ci/container/build-spirv-tools.sh (renamed from .gitlab-ci/build-spirv-tools.sh) | 0 | ||||
-rw-r--r-- | .gitlab-ci/container/build-virglrenderer.sh (renamed from .gitlab-ci/build-virglrenderer.sh) | 0 | ||||
-rw-r--r-- | .gitlab-ci/container/build-vulkantools.sh (renamed from .gitlab-ci/build-vulkantools.sh) | 0 | ||||
-rw-r--r-- | .gitlab-ci/container/create-android-cross-file.sh (renamed from .gitlab-ci/create-android-cross-file.sh) | 0 | ||||
-rw-r--r-- | .gitlab-ci/container/create-android-ndk-pc.sh (renamed from .gitlab-ci/create-android-ndk-pc.sh) | 0 | ||||
-rwxr-xr-x | .gitlab-ci/container/create-cross-file.sh (renamed from .gitlab-ci/create-cross-file.sh) | 0 | ||||
-rw-r--r-- | .gitlab-ci/container/create-rootfs.sh (renamed from .gitlab-ci/create-rootfs.sh) | 0 | ||||
-rw-r--r-- | .gitlab-ci/container/cross_build.sh | 4 | ||||
-rwxr-xr-x | .gitlab-ci/container/lava_build.sh | 20 | ||||
-rw-r--r-- | .gitlab-ci/container/x86_64.config (renamed from .gitlab-ci/x86_64.config) | 0 | ||||
-rw-r--r-- | .gitlab-ci/container/x86_build.sh | 4 | ||||
-rw-r--r-- | .gitlab-ci/container/x86_test-gl.sh | 20 | ||||
-rw-r--r-- | .gitlab-ci/container/x86_test-vk.sh | 14 | ||||
-rw-r--r-- | .gitlab-ci/lava-gitlab-ci.yml | 2 |
29 files changed, 39 insertions, 39 deletions
diff --git a/.gitlab-ci/container/android_build.sh b/.gitlab-ci/container/android_build.sh index ffc42fff149..88c05af4ee2 100644 --- a/.gitlab-ci/container/android_build.sh +++ b/.gitlab-ci/container/android_build.sh @@ -20,12 +20,12 @@ rdfind -makehardlinks true -makeresultsfile false /android-ndk-r21d/ # Drop some large tools we won't use in this build. find /android-ndk-r21d/ -type f | egrep -i "clang-check|clang-tidy|lldb" | xargs rm -f -sh .gitlab-ci/create-android-ndk-pc.sh /$ndk zlib.pc "" "-lz" "1.2.3" +sh .gitlab-ci/container/create-android-ndk-pc.sh /$ndk zlib.pc "" "-lz" "1.2.3" -sh .gitlab-ci/create-android-cross-file.sh /$ndk x86_64-linux-android x86_64 x86_64 -sh .gitlab-ci/create-android-cross-file.sh /$ndk i686-linux-android x86 x86 -sh .gitlab-ci/create-android-cross-file.sh /$ndk aarch64-linux-android arm armv8 -sh .gitlab-ci/create-android-cross-file.sh /$ndk arm-linux-androideabi arm armv7hl armv7a-linux-androideabi +sh .gitlab-ci/container/create-android-cross-file.sh /$ndk x86_64-linux-android x86_64 x86_64 +sh .gitlab-ci/container/create-android-cross-file.sh /$ndk i686-linux-android x86 x86 +sh .gitlab-ci/container/create-android-cross-file.sh /$ndk aarch64-linux-android arm armv8 +sh .gitlab-ci/container/create-android-cross-file.sh /$ndk arm-linux-androideabi arm armv7hl armv7a-linux-androideabi # Not using build-libdrm.sh because we don't want its cleanup after building # each arch. Fetch and extract now. diff --git a/.gitlab-ci/arm.config b/.gitlab-ci/container/arm.config index 02c0087dff7..02c0087dff7 100644 --- a/.gitlab-ci/arm.config +++ b/.gitlab-ci/container/arm.config diff --git a/.gitlab-ci/arm64.config b/.gitlab-ci/container/arm64.config index c9f18f97d0c..c9f18f97d0c 100644 --- a/.gitlab-ci/arm64.config +++ b/.gitlab-ci/container/arm64.config diff --git a/.gitlab-ci/container/arm_build.sh b/.gitlab-ci/container/arm_build.sh index 9cffd786733..f9a2d0cbe67 100644 --- a/.gitlab-ci/container/arm_build.sh +++ b/.gitlab-ci/container/arm_build.sh @@ -65,6 +65,6 @@ arch=armhf # dependencies where we want a specific version EXTRA_MESON_ARGS= -. .gitlab-ci/build-libdrm.sh +. .gitlab-ci/container/build-libdrm.sh . .gitlab-ci/container/container_post_build.sh diff --git a/.gitlab-ci/container/baremetal_build.sh b/.gitlab-ci/container/baremetal_build.sh index 02b2fa4c2b0..e3a4b246eb3 100644 --- a/.gitlab-ci/container/baremetal_build.sh +++ b/.gitlab-ci/container/baremetal_build.sh @@ -47,7 +47,7 @@ mkdir /var/cache/apt/archives/$arch ############### Create cross-files -. .gitlab-ci/create-cross-file.sh $arch +. .gitlab-ci/container/create-cross-file.sh $arch . .gitlab-ci/container/container_pre_build.sh diff --git a/.gitlab-ci/build-apitrace.sh b/.gitlab-ci/container/build-apitrace.sh index 78a633c6a43..78a633c6a43 100644 --- a/.gitlab-ci/build-apitrace.sh +++ b/.gitlab-ci/container/build-apitrace.sh diff --git a/.gitlab-ci/build-deqp-runner.sh b/.gitlab-ci/container/build-deqp-runner.sh index 7efa1dbc14f..7efa1dbc14f 100644 --- a/.gitlab-ci/build-deqp-runner.sh +++ b/.gitlab-ci/container/build-deqp-runner.sh diff --git a/.gitlab-ci/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh index a25df610cad..a25df610cad 100644 --- a/.gitlab-ci/build-deqp.sh +++ b/.gitlab-ci/container/build-deqp.sh diff --git a/.gitlab-ci/build-fossilize.sh b/.gitlab-ci/container/build-fossilize.sh index 43a879e988e..43a879e988e 100644 --- a/.gitlab-ci/build-fossilize.sh +++ b/.gitlab-ci/container/build-fossilize.sh diff --git a/.gitlab-ci/build-gfxreconstruct.sh b/.gitlab-ci/container/build-gfxreconstruct.sh index 6b79e9a3f26..6b79e9a3f26 100644 --- a/.gitlab-ci/build-gfxreconstruct.sh +++ b/.gitlab-ci/container/build-gfxreconstruct.sh diff --git a/.gitlab-ci/build-libclc.sh b/.gitlab-ci/container/build-libclc.sh index 7867d5833af..7867d5833af 100644 --- a/.gitlab-ci/build-libclc.sh +++ b/.gitlab-ci/container/build-libclc.sh diff --git a/.gitlab-ci/build-libdrm.sh b/.gitlab-ci/container/build-libdrm.sh index 9484fc36d8d..9484fc36d8d 100644 --- a/.gitlab-ci/build-libdrm.sh +++ b/.gitlab-ci/container/build-libdrm.sh diff --git a/.gitlab-ci/build-piglit.sh b/.gitlab-ci/container/build-piglit.sh index 63c26a0e010..63c26a0e010 100644 --- a/.gitlab-ci/build-piglit.sh +++ b/.gitlab-ci/container/build-piglit.sh diff --git a/.gitlab-ci/build-renderdoc.sh b/.gitlab-ci/container/build-renderdoc.sh index b44fb302011..b44fb302011 100644 --- a/.gitlab-ci/build-renderdoc.sh +++ b/.gitlab-ci/container/build-renderdoc.sh diff --git a/.gitlab-ci/build-rust.sh b/.gitlab-ci/container/build-rust.sh index 7085448d418..7085448d418 100644 --- a/.gitlab-ci/build-rust.sh +++ b/.gitlab-ci/container/build-rust.sh diff --git a/.gitlab-ci/build-spirv-tools.sh b/.gitlab-ci/container/build-spirv-tools.sh index e39083c30d4..e39083c30d4 100644 --- a/.gitlab-ci/build-spirv-tools.sh +++ b/.gitlab-ci/container/build-spirv-tools.sh diff --git a/.gitlab-ci/build-virglrenderer.sh b/.gitlab-ci/container/build-virglrenderer.sh index 20cd9474147..20cd9474147 100644 --- a/.gitlab-ci/build-virglrenderer.sh +++ b/.gitlab-ci/container/build-virglrenderer.sh diff --git a/.gitlab-ci/build-vulkantools.sh b/.gitlab-ci/container/build-vulkantools.sh index 5924c80d249..5924c80d249 100644 --- a/.gitlab-ci/build-vulkantools.sh +++ b/.gitlab-ci/container/build-vulkantools.sh diff --git a/.gitlab-ci/create-android-cross-file.sh b/.gitlab-ci/container/create-android-cross-file.sh index 99ad5b98b46..99ad5b98b46 100644 --- a/.gitlab-ci/create-android-cross-file.sh +++ b/.gitlab-ci/container/create-android-cross-file.sh diff --git a/.gitlab-ci/create-android-ndk-pc.sh b/.gitlab-ci/container/create-android-ndk-pc.sh index 1380cc240be..1380cc240be 100644 --- a/.gitlab-ci/create-android-ndk-pc.sh +++ b/.gitlab-ci/container/create-android-ndk-pc.sh diff --git a/.gitlab-ci/create-cross-file.sh b/.gitlab-ci/container/create-cross-file.sh index 0330d7b4818..0330d7b4818 100755 --- a/.gitlab-ci/create-cross-file.sh +++ b/.gitlab-ci/container/create-cross-file.sh diff --git a/.gitlab-ci/create-rootfs.sh b/.gitlab-ci/container/create-rootfs.sh index 72cdae20810..72cdae20810 100644 --- a/.gitlab-ci/create-rootfs.sh +++ b/.gitlab-ci/container/create-rootfs.sh diff --git a/.gitlab-ci/container/cross_build.sh b/.gitlab-ci/container/cross_build.sh index 8d74cf23e41..15d28b1acc8 100644 --- a/.gitlab-ci/container/cross_build.sh +++ b/.gitlab-ci/container/cross_build.sh @@ -47,7 +47,7 @@ fi apt-get install -y --no-remove -t buster-backports \ $LLVM:$arch -. .gitlab-ci/create-cross-file.sh $arch +. .gitlab-ci/container/create-cross-file.sh $arch . .gitlab-ci/container/container_pre_build.sh @@ -55,7 +55,7 @@ apt-get install -y --no-remove -t buster-backports \ # dependencies where we want a specific version EXTRA_MESON_ARGS="--cross-file=/cross_file-${arch}.txt -D libdir=lib/$(dpkg-architecture -A $arch -qDEB_TARGET_MULTIARCH)" -. .gitlab-ci/build-libdrm.sh +. .gitlab-ci/container/build-libdrm.sh apt-get purge -y \ $STABLE_EPHEMERAL diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh index d4bb92371b0..36c5c1840fd 100755 --- a/.gitlab-ci/container/lava_build.sh +++ b/.gitlab-ci/container/lava_build.sh @@ -18,7 +18,7 @@ check_minio "${CI_PROJECT_PATH}" . .gitlab-ci/container/container_pre_build.sh # Install rust, which we'll be using for deqp-runner. It will be cleaned up at the end. -. .gitlab-ci/build-rust.sh +. .gitlab-ci/container/build-rust.sh if [[ "$DEBIAN_ARCH" = "arm64" ]]; then GCC_ARCH="aarch64-linux-gnu" @@ -32,7 +32,7 @@ elif [[ "$DEBIAN_ARCH" = "armhf" ]]; then DEFCONFIG="arch/arm/configs/multi_v7_defconfig" DEVICE_TREES="arch/arm/boot/dts/rk3288-veyron-jaq.dtb arch/arm/boot/dts/sun8i-h3-libretech-all-h3-cc.dtb" KERNEL_IMAGE_NAME="zImage" - . .gitlab-ci/create-cross-file.sh armhf + . .gitlab-ci/container/create-cross-file.sh armhf else GCC_ARCH="x86_64-linux-gnu" KERNEL_ARCH="x86_64" @@ -111,26 +111,26 @@ mkdir -p /lava-files/rootfs-${DEBIAN_ARCH} ############### Build dEQP runner -. .gitlab-ci/build-deqp-runner.sh +. .gitlab-ci/container/build-deqp-runner.sh mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/usr/bin mv /usr/local/bin/deqp-runner /lava-files/rootfs-${DEBIAN_ARCH}/usr/bin/. ############### Build dEQP -DEQP_TARGET=surfaceless . .gitlab-ci/build-deqp.sh +DEQP_TARGET=surfaceless . .gitlab-ci/container/build-deqp.sh mv /deqp /lava-files/rootfs-${DEBIAN_ARCH}/. ############### Build piglit if [ -n "$INCLUDE_PIGLIT" ]; then - . .gitlab-ci/build-piglit.sh + . .gitlab-ci/container/build-piglit.sh mv /piglit /lava-files/rootfs-${DEBIAN_ARCH}/. fi ############### Build apitrace -. .gitlab-ci/build-apitrace.sh +. .gitlab-ci/container/build-apitrace.sh mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/apitrace mv /apitrace/build /lava-files/rootfs-${DEBIAN_ARCH}/apitrace rm -rf /apitrace @@ -142,7 +142,7 @@ rm -rf /waffle ############### Build renderdoc EXTRA_CMAKE_ARGS+=" -DENABLE_XCB=false" -. .gitlab-ci/build-renderdoc.sh +. .gitlab-ci/container/build-renderdoc.sh mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/renderdoc mv /renderdoc/build /lava-files/rootfs-${DEBIAN_ARCH}/renderdoc rm -rf /renderdoc @@ -150,7 +150,7 @@ rm -rf /renderdoc ############### Build libdrm EXTRA_MESON_ARGS+=" -D prefix=/libdrm" -. .gitlab-ci/build-libdrm.sh +. .gitlab-ci/container/build-libdrm.sh ############### Cross-build kernel @@ -173,7 +173,7 @@ if [ -n "$INSTALL_KERNEL_MODULES" ]; then sed -i 's/=m/=n/g' ${DEFCONFIG} fi -./scripts/kconfig/merge_config.sh ${DEFCONFIG} ../.gitlab-ci/${KERNEL_ARCH}.config +./scripts/kconfig/merge_config.sh ${DEFCONFIG} ../.gitlab-ci/container/${KERNEL_ARCH}.config make ${KERNEL_IMAGE_NAME} for image in ${KERNEL_IMAGE_NAME}; do cp arch/${KERNEL_ARCH}/boot/${image} /lava-files/. @@ -220,7 +220,7 @@ debootstrap \ cat /lava-files/rootfs-${DEBIAN_ARCH}/debootstrap/debootstrap.log set -e -cp .gitlab-ci/create-rootfs.sh /lava-files/rootfs-${DEBIAN_ARCH}/. +cp .gitlab-ci/container/create-rootfs.sh /lava-files/rootfs-${DEBIAN_ARCH}/. cp .gitlab-ci/container/llvm-snapshot.gpg.key /lava-files/rootfs-${DEBIAN_ARCH}/. chroot /lava-files/rootfs-${DEBIAN_ARCH} \ sh -c "INCLUDE_PIGLIT=$INCLUDE_PIGLIT sh /create-rootfs.sh" diff --git a/.gitlab-ci/x86_64.config b/.gitlab-ci/container/x86_64.config index 63b5e3ada33..63b5e3ada33 100644 --- a/.gitlab-ci/x86_64.config +++ b/.gitlab-ci/container/x86_64.config diff --git a/.gitlab-ci/container/x86_build.sh b/.gitlab-ci/container/x86_build.sh index c7e46476ef3..33d596c751e 100644 --- a/.gitlab-ci/container/x86_build.sh +++ b/.gitlab-ci/container/x86_build.sh @@ -81,7 +81,7 @@ tar -xvf $LIBXCB_VERSION.tar.bz2 && rm $LIBXCB_VERSION.tar.bz2 cd $LIBXCB_VERSION; ./configure; make install; cd .. rm -rf $LIBXCB_VERSION -. .gitlab-ci/build-libdrm.sh +. .gitlab-ci/container/build-libdrm.sh wget $WAYLAND_RELEASES/$LIBWAYLAND_VERSION.tar.xz tar -xvf $LIBWAYLAND_VERSION.tar.xz && rm $LIBWAYLAND_VERSION.tar.xz @@ -103,7 +103,7 @@ tar -xvf libglvnd-v$GLVND_VERSION.tar.gz && rm libglvnd-v$GLVND_VERSION.tar.gz pushd libglvnd-v$GLVND_VERSION; ./autogen.sh; ./configure; make install; popd rm -rf libglvnd-v$GLVND_VERSION -. .gitlab-ci/build-spirv-tools.sh +. .gitlab-ci/container/build-spirv-tools.sh git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator -b llvm_release_100 --depth 1 pushd SPIRV-LLVM-Translator diff --git a/.gitlab-ci/container/x86_test-gl.sh b/.gitlab-ci/container/x86_test-gl.sh index 1fb616cf656..490a6fc994a 100644 --- a/.gitlab-ci/container/x86_test-gl.sh +++ b/.gitlab-ci/container/x86_test-gl.sh @@ -52,40 +52,40 @@ apt-get install -y --no-remove \ ############### Build spirv-tools (debian too old) -. .gitlab-ci/build-spirv-tools.sh +. .gitlab-ci/container/build-spirv-tools.sh ############### Build libclc -. .gitlab-ci/build-libclc.sh +. .gitlab-ci/container/build-libclc.sh ############### Build virglrenderer -. .gitlab-ci/build-virglrenderer.sh +. .gitlab-ci/container/build-virglrenderer.sh ############### Build piglit -INCLUDE_OPENCL_TESTS=1 . .gitlab-ci/build-piglit.sh +INCLUDE_OPENCL_TESTS=1 . .gitlab-ci/container/build-piglit.sh ############### Build dEQP runner (and install rust temporarily for it) -. .gitlab-ci/build-rust.sh -. .gitlab-ci/build-deqp-runner.sh +. .gitlab-ci/container/build-rust.sh +. .gitlab-ci/container/build-deqp-runner.sh rm -rf /root/.rustup /root/.cargo ############### Build dEQP GL -DEQP_TARGET=surfaceless . .gitlab-ci/build-deqp.sh +DEQP_TARGET=surfaceless . .gitlab-ci/container/build-deqp.sh ############### Build apitrace -. .gitlab-ci/build-apitrace.sh +. .gitlab-ci/container/build-apitrace.sh ############### Build renderdoc -. .gitlab-ci/build-renderdoc.sh +. .gitlab-ci/container/build-renderdoc.sh ############### Build libdrm -. .gitlab-ci/build-libdrm.sh +. .gitlab-ci/container/build-libdrm.sh ############### Uninstall the build software diff --git a/.gitlab-ci/container/x86_test-vk.sh b/.gitlab-ci/container/x86_test-vk.sh index b00a739abe3..72d94e7f37c 100644 --- a/.gitlab-ci/container/x86_test-vk.sh +++ b/.gitlab-ci/container/x86_test-vk.sh @@ -114,27 +114,27 @@ wine \ ############### Build piglit -PIGLIT_BUILD_TARGETS="piglit_replayer" . .gitlab-ci/build-piglit.sh +PIGLIT_BUILD_TARGETS="piglit_replayer" . .gitlab-ci/container/build-piglit.sh ############### Build dEQP runner (and install rust temporarily for it) -. .gitlab-ci/build-rust.sh -. .gitlab-ci/build-deqp-runner.sh +. .gitlab-ci/container/build-rust.sh +. .gitlab-ci/container/build-deqp-runner.sh rm -rf /root/.rustup /root/.cargo ############### Build Fossilize -. .gitlab-ci/build-fossilize.sh +. .gitlab-ci/container/build-fossilize.sh ############### Build dEQP VK -. .gitlab-ci/build-deqp.sh +. .gitlab-ci/container/build-deqp.sh ############### Build gfxreconstruct -. .gitlab-ci/build-gfxreconstruct.sh +. .gitlab-ci/container/build-gfxreconstruct.sh ############### Build VulkanTools -. .gitlab-ci/build-vulkantools.sh +. .gitlab-ci/container/build-vulkantools.sh ############### Uninstall the build software diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml index 6d3152ab3c4..57550b911d2 100644 --- a/.gitlab-ci/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava-gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - DISTRIBUTION_TAG: "2021-02-01-runner" + DISTRIBUTION_TAG: "2021-02-08-subdir-move" .kernel+rootfs: stage: container-2 |