bootstrap/config.py: adjust package list to align current ci image

[gd/samba-autobuild/.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fcd456f59affe4ca7c5740aa1bb3ba9ebe94d173..505df7cdbe35e17113c2f99a3f6567ab3df58252 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,8 +19,15 @@ variables:
   before_script:
     - uname -a
     - lsb_release -a
+    - cat /etc/os-release
     - mount
     - df -h
+    - cat /proc/swaps
+    - free -h
+  after_script:
+    - mount
+    - df -h
+    - cat /proc/swaps
     - free -h
   artifacts:
     expire_in: 1 week
@@ -56,7 +63,6 @@ samba:
 
 samba-none-env:
   extends: .shared_template
-  # this one takes about 1 hours to finish
 
 samba-nopython:
   extends: .shared_template
@@ -91,9 +97,6 @@ samba-ad-dc-5:
 samba-ad-dc-6:
   extends: .shared_template
 
-samba-schemaupgrade:
-  extends: .shared_template
-
 samba-ad-dc-backup:
   extends: .shared_template
 
@@ -111,20 +114,13 @@ samba-ctdb:
 
 samba-ad-dc-ntvfs:
   extends: .shared_template
-  # this one takes about 100 mins to finish
-
 
 .private_template:
   extends: .shared_template
   tags:
     - docker
     - private
-  before_script:
-    - uname -a
-    - lsb_release -a
-    - mount
-    - df -h
-    - free -h
+    - samba-ci-private
   only:
     variables:
       # These jobs are only run if the gitlab repo has private runners available.
@@ -135,10 +131,12 @@ samba-ad-dc-ntvfs:
 
 samba-fileserver:
   extends: .private_template
-  # this one takes about 1 hours to finish
 
 samba-ad-dc-1:
   extends: .private_template
 
 samba-nt4:
   extends: .private_template
+
+samba-schemaupgrade:
+  extends: .private_template