diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cc643cd9f5e8bf3e8b4ba7f43d88ea1a1a610d1d..0237fbb81fcff6d74d032e85f56716d614d5c6e8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,6 +20,7 @@ include: - local: "/helpers/docker_base.yaml" - local: "/helpers/helm_base.yaml" + build ci: stage: .pre extends: .docker_based_job diff --git a/helpers/build_image.yaml b/helpers/build_image.yaml index f6d3e9514f83234c6d405142f1de4a86ce5afb83..2541dbf46dd7d18ec420677dc433a8bd95ad811e 100644 --- a/helpers/build_image.yaml +++ b/helpers/build_image.yaml @@ -3,16 +3,15 @@ # # include: # - project: 'cspp_geo/geosphere/geosphere-deploy' -# file: '/helpers/build_image.yml' +# file: '/helpers/docker_base.yaml' +# - project: 'cspp_geo/geosphere/geosphere-deploy' +# file: '/helpers/build_image.yaml' # # build_image_grb: # extends: .build_image # variables: # IMAGE_NAME: "cspp-geo-grb" # IMAGE_DIR: "cspp_geo_grb" -include: - - local: "/helpers/docker_base.yaml" - .build_image: extends: .docker_based_job variables: diff --git a/helpers/helm_base.yaml b/helpers/helm_base.yaml index 49fa7d9a2084a86c5d6d3b367ed49805fd4d0bf1..4756581b4349e86b96672c9cdda7f626dbf23aae 100644 --- a/helpers/helm_base.yaml +++ b/helpers/helm_base.yaml @@ -1,6 +1,3 @@ -include: - local: "/helpers/docker_base.yaml" - .helm_based_job: extends: .docker_based_job image: $CICHART_IMAGE