From feb32bb2e2aa58c71cb82ceaeb0949daaec98135 Mon Sep 17 00:00:00 2001
From: Russell Ballestrini <russell.ballestrini@gmail.com>
Date: Tue, 21 Jun 2022 14:34:23 -0400
Subject: [PATCH] Child pipeline fixes race condition.

	new file:   .gitlab-ci.deploy.yml
	modified:   .gitlab-ci.yml
---
 .gitlab-ci.deploy.yml | 11 +++++++++++
 .gitlab-ci.yml        | 16 ++++++----------
 2 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 .gitlab-ci.deploy.yml

diff --git a/.gitlab-ci.deploy.yml b/.gitlab-ci.deploy.yml
new file mode 100644
index 0000000..ef726e8
--- /dev/null
+++ b/.gitlab-ci.deploy.yml
@@ -0,0 +1,11 @@
+stages:
+  - my.remarkbox.com
+
+my.remarkbox.com:
+  stage: my.remarkbox.com
+  tags: ["my.remarkbox.com"]
+  script:
+    # publish build to Salt Master
+    - sudo /opt/salt-call-state-highstate.sh
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "main"'
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fdb1197..f76d12b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 stages:
   - test
   - build
-  - my.remarkbox.com
+  - deploy
 
 test:
   stage: test
@@ -47,12 +47,8 @@ build:
       - commit-hash.txt
     expire_in: 1 month
 
-
-my.remarkbox.com:
-  stage: my.remarkbox.com
-  tags: ["my.remarkbox.com"]
-  script:
-    # publish build to Salt Master
-    - sudo /opt/salt-call-state-highstate.sh
-  rules:
-    - if: '$CI_COMMIT_BRANCH == "main"'
+deploy:
+  stage: deploy
+  needs: [build]
+  trigger:
+    include: .gitlab-ci.deploy.yml