Separate template jobs into their own files

.gitlab-ci.yml

@@ -17,29 +17,8 @@ variables:
 
 include:
   - local: "/helpers/build_image.yaml"
-
-.docker_based_job:
-  image: docker:19.03.1
-  tags:
-    - docker
-    - kubernetes
-  services:
-    - docker:19.03.1-dind
-  before_script:
-    - docker info
-    - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
-
-
-.helm_based_job:
-  extends: .docker_based_job
-  image: $CICHART_IMAGE
-  before_script:
-    - docker info
-    - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
-    - shopt -s expand_aliases
-    - alias helm='docker run -t --rm -e HELM_EXPERIMENTAL_OCI="$HELM_EXPERIMENTAL_OCI" -v $(pwd):/apps -w /apps -v ~/.kube:/root/.kube -v ~/.helm:/root/.helm -v ~/.config/helm:/root/.config/helm -v ~/.cache/helm:/root/.cache/helm alpine/helm:3.2.3'
-    - helm registry login -u ${CI_REGISTRY_USER} -p ${CI_JOB_TOKEN} ${CI_REGISTRY}
-
+  - local: "/helpers/docker_base.yaml"
+  - local: "/helpers/helm_base.yaml"
 
 build ci:
   stage: .pre

helpers/build_image.yaml

@@ -10,17 +10,15 @@
 #   variables:
 #     IMAGE_NAME: "cspp-geo-grb"
 #     IMAGE_DIR: "cspp_geo_grb"
+include:
+  - local: "/helpers/docker_base.yaml"
 
 .build_image:
+  extends: .docker_based_job
   variables:
     IMAGE_NAME: ""
     IMAGE_DIR: ""
   stage: build image
-  tags:
-    - docker
-    - kubernetes
-  before_script:
-    - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
   script:
     - image_url="${CI_REGISTRY_IMAGE}/${IMAGE_NAME}"
     - if [ -z "$CI_COMMIT_TAG" ]; then

helpers/docker_base.yaml

+.docker_based_job:
+  image: docker:19.03.1
+  tags:
+    - docker
+    - kubernetes
+  services:
+    - docker:19.03.1-dind
+  before_script:
+    - docker info
+    - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}

helpers/helm_base.yaml

+include:
+  local: "/helpers/docker_base.yaml"
+
+.helm_based_job:
+  extends: .docker_based_job
+  image: $CICHART_IMAGE
+  before_script:
+    - docker info
+    - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
+    - shopt -s expand_aliases
+    - alias helm='docker run -t --rm -e HELM_EXPERIMENTAL_OCI="$HELM_EXPERIMENTAL_OCI" -v $(pwd):/apps -w /apps -v ~/.kube:/root/.kube -v ~/.helm:/root/.helm -v ~/.config/helm:/root/.config/helm -v ~/.cache/helm:/root/.cache/helm alpine/helm:3.2.3'
+    - helm registry login -u ${CI_REGISTRY_USER} -p ${CI_JOB_TOKEN} ${CI_REGISTRY}