From eb6b78c9b56036df5a06435a76b29fcb634eb4bb Mon Sep 17 00:00:00 2001
From: Esben Haabendal <esben.haabendal@huawei.com>
Date: Wed, 24 Aug 2022 10:06:58 +0200
Subject: [PATCH] CI: Only build container images when changed
Signed-off-by: Esben Haabendal <esben.haabendal@huawei.com>
---
.gitlab-ci/container.yml | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci/container.yml b/.gitlab-ci/container.yml
index 67d0e236..e3812293 100644
--- a/.gitlab-ci/container.yml
+++ b/.gitlab-ci/container.yml
@@ -21,15 +21,15 @@ variables:
stage: container
rules:
- if: $CI_REGISTRY && $CI_REGISTRY_USER && $CI_REGISTRY_PASSWORD && $CI_REGISTRY_IMAGE
+ changes:
+ - .gitlab-ci/container.yml
+ - .gitlab-ci/container/$CONTAINER_PATH/**
image:
name: gcr.io/kaniko-project/executor:debug
entrypoint: [""]
variables:
CONTAINER_DOCKERFILE: Dockerfile
script:
- - if [ -z "$CONTAINER_PATH" ] ; then
- CONTAINER_PATH="$CONTAINER_NAME" ;
- fi
- CONTEXT="$CI_PROJECT_DIR/.gitlab-ci/container/$CONTAINER_PATH"
- DOCKERFILE="$CONTEXT/$CONTAINER_DOCKERFILE"
- if [ -n "$CONTAINER_FROM" ] ; then
@@ -71,13 +71,12 @@ bitbake-builder:
variables:
CONTAINER_NAME: bitbake-builder
CONTAINER_VERSION: $BITBAKE_CONTAINER_VERSION
+ CONTAINER_PATH: bitbake-builder
bitbake-toolbox:
- extends: .kaniko
+ extends: bitbake-builder
variables:
CONTAINER_NAME: bitbake-toolbox
- CONTAINER_VERSION: $BITBAKE_CONTAINER_VERSION
- CONTAINER_PATH: bitbake-builder
CONTAINER_DOCKERFILE: Dockerfile.toolbox
CONTAINER_FROM: bitbake-builder
needs:
@@ -89,13 +88,12 @@ openharmony-builder:
variables:
CONTAINER_NAME: openharmony-builder
CONTAINER_VERSION: $OPENHARMONY_CONTAINER_VERSION
+ CONTAINER_PATH: openharmony-builder
openharmony-toolbox:
- extends: .kaniko
+ extends: openharmony-builder
variables:
CONTAINER_NAME: openharmony-toolbox
- CONTAINER_VERSION: $OPENHARMONY_CONTAINER_VERSION
- CONTAINER_PATH: openharmony-builder
CONTAINER_DOCKERFILE: Dockerfile.toolbox
CONTAINER_FROM: openharmony-builder
needs:
--
GitLab