From 8a559b17061d53fa12041d9e965641218ae8dd48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Thu, 25 Apr 2024 10:10:21 +0000 Subject: [PATCH] ci: set designated branch to prpl/nightly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit So we're using the same base containers and avoid different glibc version issues currently manifesting in the SDKs: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.34' not found (required by /home/builder/staging_dir/host/lib/libfakeroot.so) References: PCF-1011 Signed-off-by: Petr Štetiar --- .gitlab-ci.yml | 2 +- .gitlab/docker/ib/Dockerfile | 2 +- .gitlab/docker/ib/lcm/scripts/build-push-lcm-containers.sh | 2 +- .gitlab/docker/sdk/Dockerfile | 2 +- .gitlab/sdk.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9ab3ad3796..7351a32c38 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - CI_DESIGNATED_BRANCH: prplos + CI_DESIGNATED_BRANCH: prpl/nightly include: - local: .gitlab/build.yml diff --git a/.gitlab/docker/ib/Dockerfile b/.gitlab/docker/ib/Dockerfile index 535c113c74..0aa5e152f1 100644 --- a/.gitlab/docker/ib/Dockerfile +++ b/.gitlab/docker/ib/Dockerfile @@ -1,4 +1,4 @@ -ARG DESIGNATED_BRANCH=prplos +ARG DESIGNATED_BRANCH=prpl/nightly # FIXME: its overkill to use this container FROM registry.gitlab.com/prpl-foundation/prplos/prplos/$DESIGNATED_BRANCH/builder:latest diff --git a/.gitlab/docker/ib/lcm/scripts/build-push-lcm-containers.sh b/.gitlab/docker/ib/lcm/scripts/build-push-lcm-containers.sh index 0530ed0987..610c541544 100644 --- a/.gitlab/docker/ib/lcm/scripts/build-push-lcm-containers.sh +++ b/.gitlab/docker/ib/lcm/scripts/build-push-lcm-containers.sh @@ -2,7 +2,7 @@ set -e -CI_DESIGNATED_BRANCH=${CI_DESIGNATED_BRANCH:-prplos} +CI_DESIGNATED_BRANCH=${CI_DESIGNATED_BRANCH:-prpl/nightly} CI_COMMIT_REF_SLUG=${CI_COMMIT_REF_SLUG:-ynezz-lcm-containers} CI_REGISTRY_IMAGE=${CI_REGISTRY_IMAGE:-registry.gitlab.com/prpl-foundation/prplos/prplos} diff --git a/.gitlab/docker/sdk/Dockerfile b/.gitlab/docker/sdk/Dockerfile index 1cca90c217..88b5ca14b8 100644 --- a/.gitlab/docker/sdk/Dockerfile +++ b/.gitlab/docker/sdk/Dockerfile @@ -1,4 +1,4 @@ -ARG DESIGNATED_BRANCH=prplos +ARG DESIGNATED_BRANCH=prpl/nightly FROM registry.gitlab.com/prpl-foundation/prplos/prplos/$DESIGNATED_BRANCH/builder:latest COPY --chown=builder:builder . /home/builder/ diff --git a/.gitlab/sdk.yml b/.gitlab/sdk.yml index 87114c22a1..284e42a9fd 100644 --- a/.gitlab/sdk.yml +++ b/.gitlab/sdk.yml @@ -1,5 +1,5 @@ variables: - CI_DESIGNATED_BRANCH: prplos + CI_DESIGNATED_BRANCH: prpl/nightly stages: - generate