ci: update base image to debian 11

also update the ci-template sha

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/836>
This commit is contained in:
Jordan Petridis 2021-08-16 15:35:16 +03:00 committed by Jordan Petridіs
parent f504493134
commit abfa75b334
2 changed files with 24 additions and 24 deletions

View file

@ -17,7 +17,7 @@
# Updating the nightly image should be done by simply running a scheduled ci # Updating the nightly image should be done by simply running a scheduled ci
# pipeline on the upstream repo with the $UPDATE_NIGHTLY variable defined. # pipeline on the upstream repo with the $UPDATE_NIGHTLY variable defined.
.templates_sha: &templates_sha 322bf2b8f29b6491caeb13861201e96969ddc169 .templates_sha: &templates_sha 567700e483aabed992d0a4fea84994a0472deff6
include: include:
- project: 'freedesktop/ci-templates' - project: 'freedesktop/ci-templates'
@ -47,9 +47,9 @@ stages:
- "deploy" - "deploy"
.debian:10: .debian:11:
variables: variables:
FDO_DISTRIBUTION_VERSION: 10 FDO_DISTRIBUTION_VERSION: 'bullseye-slim'
before_script: before_script:
- source ./ci/env.sh - source ./ci/env.sh
- mkdir .cargo && echo -e "[net]\ngit-fetch-with-cli = true" > .cargo/config - mkdir .cargo && echo -e "[net]\ngit-fetch-with-cli = true" > .cargo/config
@ -61,26 +61,26 @@ stages:
cargo update --color=always cargo update --color=always
fi fi
.debian:10-base: .debian:11-base:
extends: .debian:10 extends: .debian:11
variables: variables:
FDO_DISTRIBUTION_TAG: 'base-$GST_RS_IMG_TAG' FDO_DISTRIBUTION_TAG: 'base-$GST_RS_IMG_TAG'
.debian:10-stable: .debian:11-stable:
extends: .debian:10 extends: .debian:11
variables: variables:
RUST_IMAGE_FULL: "1" RUST_IMAGE_FULL: "1"
FDO_DISTRIBUTION_TAG: '$GST_RS_STABLE-$GST_RS_IMG_TAG' FDO_DISTRIBUTION_TAG: '$GST_RS_STABLE-$GST_RS_IMG_TAG'
FDO_DISTRIBUTION_EXEC: 'bash ci/install-rust.sh $GST_RS_STABLE $RUST_IMAGE_FULL' FDO_DISTRIBUTION_EXEC: 'bash ci/install-rust.sh $GST_RS_STABLE $RUST_IMAGE_FULL'
.debian:10-msrv: .debian:11-msrv:
extends: .debian:10 extends: .debian:11
variables: variables:
FDO_DISTRIBUTION_TAG: '$GST_RS_MSRV-$GST_RS_IMG_TAG' FDO_DISTRIBUTION_TAG: '$GST_RS_MSRV-$GST_RS_IMG_TAG'
FDO_DISTRIBUTION_EXEC: 'bash ci/install-rust.sh $GST_RS_MSRV $RUST_IMAGE_FULL' FDO_DISTRIBUTION_EXEC: 'bash ci/install-rust.sh $GST_RS_MSRV $RUST_IMAGE_FULL'
.debian:10-nightly: .debian:11-nightly:
extends: .debian:10 extends: .debian:11
variables: variables:
FDO_DISTRIBUTION_TAG: 'nightly-$GST_RS_IMG_TAG' FDO_DISTRIBUTION_TAG: 'nightly-$GST_RS_IMG_TAG'
FDO_DISTRIBUTION_EXEC: 'bash ci/install-rust.sh nightly $RUST_IMAGE_FULL' FDO_DISTRIBUTION_EXEC: 'bash ci/install-rust.sh nightly $RUST_IMAGE_FULL'
@ -90,7 +90,7 @@ stages:
- .fdo.container-build@debian - .fdo.container-build@debian
stage: container-base stage: container-base
variables: variables:
FDO_DISTRIBUTION_PACKAGES: "build-essential curl python3-setuptools liborc-0.4-dev libglib2.0-dev libxml2-dev libgtk-3-dev libegl1-mesa libgles2-mesa libgl1-mesa-dri libgl1-mesa-glx libwayland-egl1-mesa xz-utils libssl-dev git wget ca-certificates ninja-build python3-pip flex bison libglib2.0-dev" FDO_DISTRIBUTION_PACKAGES: "build-essential curl python3-setuptools liborc-0.4-dev libglib2.0-dev libxml2-dev libgtk-3-dev libegl1-mesa libgles2-mesa libgl1-mesa-dri libgl1-mesa-glx libwayland-egl1-mesa xz-utils libssl-dev git wget ca-certificates ninja-build python3-pip flex bison libglib2.0-dev libx11-dev libx11-xcb-dev"
FDO_DISTRIBUTION_EXEC: 'bash ci/install-gst.sh && pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates' FDO_DISTRIBUTION_EXEC: 'bash ci/install-gst.sh && pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates'
.build-final-image: .build-final-image:
@ -98,27 +98,27 @@ stages:
- .fdo.container-build@debian - .fdo.container-build@debian
stage: container-final stage: container-final
variables: variables:
FDO_BASE_IMAGE: '$CI_REGISTRY_IMAGE/debian/10:base-$GST_RS_IMG_TAG' FDO_BASE_IMAGE: '$CI_REGISTRY_IMAGE/debian/bullseye-slim:base-$GST_RS_IMG_TAG'
build-base: build-base:
extends: extends:
- .build-base-image - .build-base-image
- .debian:10-base - .debian:11-base
build-stable: build-stable:
extends: extends:
- .build-final-image - .build-final-image
- .debian:10-stable - .debian:11-stable
build-msrv: build-msrv:
extends: extends:
- .build-final-image - .build-final-image
- .debian:10-msrv - .debian:11-msrv
build-nightly: build-nightly:
extends: extends:
- .build-final-image - .build-final-image
- .debian:10-nightly - .debian:11-nightly
update-nightly: update-nightly:
extends: build-nightly extends: build-nightly
@ -136,17 +136,17 @@ update-nightly:
.img-stable: .img-stable:
extends: extends:
- .debian:10-stable - .debian:11-stable
- .dist-debian-container - .dist-debian-container
.img-msrv: .img-msrv:
extends: extends:
- .debian:10-msrv - .debian:11-msrv
- .dist-debian-container - .dist-debian-container
.img-nightly: .img-nightly:
extends: extends:
- .debian:10-nightly - .debian:11-nightly
- .dist-debian-container - .dist-debian-container
# GST_PLUGINS_RS_TOKEN is a variable of type 'Var' defined in gstreamer-rs CI # GST_PLUGINS_RS_TOKEN is a variable of type 'Var' defined in gstreamer-rs CI
@ -180,7 +180,7 @@ plugins-update-stable:
extends: extends:
- .plugins-update - .plugins-update
- .img-stable - .img-stable
image: registry.freedesktop.org/freedesktop/ci-templates/buildah:2020-03-04 image: quay.io/freedesktop.org/ci-templates:container-build-base-2021-07-29.0
variables: variables:
UPDATE_IMG: "stable" UPDATE_IMG: "stable"
@ -188,7 +188,7 @@ plugins-update-msrv:
extends: extends:
- .plugins-update - .plugins-update
- .img-msrv - .img-msrv
image: registry.freedesktop.org/freedesktop/ci-templates/buildah:2020-03-04 image: quay.io/freedesktop.org/ci-templates:container-build-base-2021-07-29.0
variables: variables:
UPDATE_IMG: "msrv" UPDATE_IMG: "msrv"
@ -196,7 +196,7 @@ plugins-update-nightly:
extends: extends:
- .plugins-update - .plugins-update
- .img-nightly - .img-nightly
image: registry.freedesktop.org/freedesktop/ci-templates/buildah:2020-03-04 image: quay.io/freedesktop.org/ci-templates:container-build-base-2021-07-29.0
variables: variables:
UPDATE_IMG: "nightly" UPDATE_IMG: "nightly"

View file

@ -1,4 +1,4 @@
variables: variables:
GST_RS_IMG_TAG: '2021-07-26.1' GST_RS_IMG_TAG: '2021-08-16.3'
GST_RS_STABLE: '1.54.0' GST_RS_STABLE: '1.54.0'
GST_RS_MSRV: '1.54.0' GST_RS_MSRV: '1.54.0'