[gitlab-ci] move stage declaration into .gitlab-ci.yml from template

Matthew-Beckett · May 16, 2021 · 315813b · 315813b
1 parent 0e0536b
commit 315813b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,25 +1,32 @@
 stages:
   - image_build
+  - dependent_image_build
 
 include:
   - local: .gitlab/templates/dkr_image_build.yml
 
 nxagent:
   extends: .image_build
+  stage: image_build
   variables:
     DOCKERFILE_PATH: nxagent
 
 server:
   extends: .image_build
+  stage: image_build
   variables:
     DOCKERFILE_PATH: server
 
 webui:
   extends: .image_build
+  stage: image_build
   variables:
     DOCKERFILE_PATH: webui
 
 webuirest:
   extends: .image_build
+  stage: dependent_image_build
   variables:
-    DOCKERFILE_PATH: webuirest
+    DOCKERFILE_PATH: webuirest
+  needs:
+    - webui
diff --git a/.gitlab/templates/dkr_image_build.yml b/.gitlab/templates/dkr_image_build.yml
@@ -1,6 +1,5 @@
 .image_build:
   image: docker:latest
-  stage: image_build
   services:
     - docker:dind
   variables: