From c9764342c2f67983a037714110913dafe0dba59e Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 30 Apr 2018 20:18:52 +1200
Subject: [PATCH] gitlab-ci: split up gitlab-ci file

The "private" build environments are not available to most users so
remove this from the default build.  Only developers with access
to private runners (rather than a shared runner) will have a runner
tagged as "private".

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
---
 .gitlab-ci-private.yml | 48 ++++++++++++++++++++++++++++++++++++++++++
 .gitlab-ci.yml         | 45 ---------------------------------------
 2 files changed, 48 insertions(+), 45 deletions(-)
 create mode 100644 .gitlab-ci-private.yml

diff --git a/.gitlab-ci-private.yml b/.gitlab-ci-private.yml
new file mode 100644
index 00000000000..46acf77041f
--- /dev/null
+++ b/.gitlab-ci-private.yml
@@ -0,0 +1,48 @@
+include:
+ - '/.gitlab-ci.yml'
+
+
+build_samba:
+  stage: build
+  tags:
+    - docker
+    - private
+  script:
+    # this one takes about 4 hours to finish
+    - python script/autobuild.py samba            --verbose --tail --testbase /tmp/samba-testbase
+
+build_samba_nt4:
+  stage: build
+  tags:
+    - docker
+    - private
+  script:
+    # this one takes about 1 hours to finish
+    - python script/autobuild.py samba-nt4        --verbose --tail --testbase /tmp/samba-testbase
+
+build_samba_fileserver:
+  stage: build
+  tags:
+    - docker
+    - private
+  script:
+    # this one takes about 1 hours to finish
+    - python script/autobuild.py samba-fileserver --verbose --tail --testbase /tmp/samba-testbase
+
+build_samba_ad_dc:
+  stage: build
+  tags:
+    - docker
+    - private
+  script:
+    # this one takes about 1 hours to finish
+    - python script/autobuild.py samba-ad-dc     --verbose --tail --testbase /tmp/samba-testbase
+
+build_samba_ad_dc_2:
+  stage: build
+  tags:
+    - docker
+    - private
+  script:
+    # this one takes about 1 hours to finish
+    - python script/autobuild.py samba-ad-dc-2     --verbose --tail --testbase /tmp/samba-testbase
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cde8341d0f7..bfefc23aa58 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,51 +14,6 @@ before_script:
       sudo swapon /samba-swap;
     fi
 
-build_samba:
-  stage: build
-  tags:
-    - docker
-    - private
-  script:
-    # this one takes about 4 hours to finish
-    - python script/autobuild.py samba            --verbose --tail --testbase /tmp/samba-testbase
-
-build_samba_nt4:
-  stage: build
-  tags:
-    - docker
-    - private
-  script:
-    # this one takes about 1 hours to finish
-    - python script/autobuild.py samba-nt4        --verbose --tail --testbase /tmp/samba-testbase
-
-build_samba_fileserver:
-  stage: build
-  tags:
-    - docker
-    - private
-  script:
-    # this one takes about 1 hours to finish
-    - python script/autobuild.py samba-fileserver --verbose --tail --testbase /tmp/samba-testbase
-
-build_samba_ad_dc:
-  stage: build
-  tags:
-    - docker
-    - private
-  script:
-    # this one takes about 1 hours to finish
-    - python script/autobuild.py samba-ad-dc     --verbose --tail --testbase /tmp/samba-testbase
-
-build_samba_ad_dc_2:
-  stage: build
-  tags:
-    - docker
-    - private
-  script:
-    # this one takes about 1 hours to finish
-    - python script/autobuild.py samba-ad-dc-2     --verbose --tail --testbase /tmp/samba-testbase
-
 build_samba_none_env:
   stage: build
   tags:
-- 
2.34.1