From c88fd09ebea5348b5ad1025a3fcdd625ea8ffbfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Thu, 16 Nov 2023 13:19:59 +0000 Subject: [PATCH] ci: extend SDK stage with ImageBuilder MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We're going to provide ImageBuilder containers as well, so lets extend current SDK stage with ImageBuilder. References: LCM-737 Signed-off-by: Petr Štetiar --- .gitlab-ci.yml | 6 +++--- .gitlab/docker.yml | 2 +- .gitlab/docker/sdk/gitlab.yml | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d72cf5e430..30aea296f4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,9 +26,9 @@ stages: - docker deploy - build - release - - docker SDK - - docker SDK test - - docker SDK deploy + - docker SDK and IB + - docker SDK and IB test + - docker SDK and IB deploy - run - cdrouter - coverity diff --git a/.gitlab/docker.yml b/.gitlab/docker.yml index 12d829f0af..3ef4586f36 100644 --- a/.gitlab/docker.yml +++ b/.gitlab/docker.yml @@ -27,7 +27,7 @@ - docker push "$CI_REGISTRY_IMAGE/$CI_DESIGNATED_BRANCH/$IMAGE_NAME:$CI_COMMIT_REF_SLUG" .test Docker SDK image: - stage: docker SDK test + stage: docker SDK and IB test extends: .docker in docker script: - export IMAGE_NAME="$(echo $CI_JOB_NAME | sed 's/test Docker image \(.*\)/\1/')" diff --git a/.gitlab/docker/sdk/gitlab.yml b/.gitlab/docker/sdk/gitlab.yml index 119288e7ec..58876d2eee 100644 --- a/.gitlab/docker/sdk/gitlab.yml +++ b/.gitlab/docker/sdk/gitlab.yml @@ -1,5 +1,5 @@ build Docker image sdk-mvebu-cortexa9: - stage: docker SDK + stage: docker SDK and IB needs: ["build test mvebu prpl security"] variables: DOCKER_DOCKERFILE_PATH: .gitlab/docker/sdk @@ -13,13 +13,13 @@ test Docker image sdk-mvebu-cortexa9: needs: ["build Docker image sdk-mvebu-cortexa9"] deploy Docker image sdk-mvebu-cortexa9: - stage: docker SDK deploy + stage: docker SDK and IB deploy extends: .deploy Docker image needs: ["test Docker image sdk-mvebu-cortexa9"] build Docker image sdk-x86-64: - stage: docker SDK + stage: docker SDK and IB needs: ["build test x86_64 prpl security"] variables: DOCKER_DOCKERFILE_PATH: .gitlab/docker/sdk @@ -33,13 +33,13 @@ test Docker image sdk-x86-64: needs: ["build Docker image sdk-x86-64"] deploy Docker image sdk-x86-64: - stage: docker SDK deploy + stage: docker SDK and IB deploy extends: .deploy Docker image needs: ["test Docker image sdk-x86-64"] build Docker image sdk-ipq807x-generic: - stage: docker SDK + stage: docker SDK and IB needs: ["build test ipq807x prpl"] variables: DOCKER_DOCKERFILE_PATH: .gitlab/docker/sdk @@ -53,6 +53,6 @@ test Docker image sdk-ipq807x-generic: needs: ["build Docker image sdk-ipq807x-generic"] deploy Docker image sdk-ipq807x-generic: - stage: docker SDK deploy + stage: docker SDK and IB deploy extends: .deploy Docker image needs: ["test Docker image sdk-ipq807x-generic"]