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 53b2acf121fee8c5ddc48118964c0b0bb57c97f1..505df7cdbe35e17113c2f99a3f6567ab3df58252 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,15 +3,15 @@
 
 variables:
   # we run autobuild.py inside a samba CI docker image located on gitlab's registry
-  SAMBA_CI_DOCKER_REGISTRY: registry.gitlab.com
-  SAMBA_CI_DOCKER_NAME: samba-team/samba
-  SAMBA_CI_DOCKER_TAG: latest
-  SAMBA_CI_DOCKER_IMAGE: $SAMBA_CI_DOCKER_REGISTRY/$SAMBA_CI_DOCKER_NAME:$SAMBA_CI_DOCKER_TAG
+  SAMBA_CI_CONTAINER_REGISTRY: registry.gitlab.com
+  SAMBA_CI_CONTAINER_NAME: samba-team/samba
+  SAMBA_CI_CONTAINER_TAG: latest
+  SAMBA_CI_CONTAINER_IMAGE: $SAMBA_CI_CONTAINER_REGISTRY/$SAMBA_CI_CONTAINER_NAME:$SAMBA_CI_CONTAINER_TAG
   GIT_STRATEGY: fetch
   GIT_DEPTH: "3"
 
 .shared_template:
-  image: $SAMBA_CI_DOCKER_IMAGE
+  image: $SAMBA_CI_CONTAINER_IMAGE
   stage: build
   tags:
     - docker
@@ -19,14 +19,15 @@ variables:
   before_script:
     - uname -a
     - lsb_release -a
-    - echo "Build starting (preparing swap)..."
-    - if [ $(df -m / --output=avail | tail -n1) -gt 10240 ]; then
-        sudo dd if=/dev/zero of=/samba-swap bs=1M count=6144;
-        sudo mkswap /samba-swap;
-        sudo swapon /samba-swap;
-      fi
+    - 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
@@ -57,17 +58,18 @@ others:
     - script/autobuild.py tdb              --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
     - script/autobuild.py tevent           --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
-samba-none-env:
+samba:
   extends: .shared_template
-  # this one takes about 1 hours to finish
 
-samba-none-env-py2:
+samba-none-env:
   extends: .shared_template
-  # this one takes about 1 hours to finish
 
 samba-nopython:
   extends: .shared_template
 
+samba-nopython-py2:
+  extends: .shared_template
+
 samba-systemkrb5:
   extends: .shared_template
 
@@ -77,21 +79,28 @@ samba-xc:
 samba-o3:
   extends: .shared_template
 
+samba-ad-member:
+  extends: .shared_template
+
 samba-ad-dc-2:
   extends: .shared_template
-  # this one takes about 1 hours to finish
 
-samba-ad-dc-backup:
+samba-ad-dc-3:
   extends: .shared_template
 
-samba-ad-dc-2-py2:
+samba-ad-dc-4:
   extends: .shared_template
-  # this one takes about 1 hours to finish
 
-samba-libs:
+samba-ad-dc-5:
   extends: .shared_template
 
-samba-libs-py2:
+samba-ad-dc-6:
+  extends: .shared_template
+
+samba-ad-dc-backup:
+  extends: .shared_template
+
+samba-libs:
   extends: .shared_template
 
 samba-static:
@@ -103,12 +112,31 @@ ctdb:
 samba-ctdb:
   extends: .shared_template
 
-samba-buildpy2-only:
-  extends: .shared_template
-
 samba-ad-dc-ntvfs:
   extends: .shared_template
-  # this one takes about 100 mins to finish
 
-samba-ad-dc-ntvfs-py2:
+.private_template:
   extends: .shared_template
+  tags:
+    - docker
+    - private
+    - samba-ci-private
+  only:
+    variables:
+      # These jobs are only run if the gitlab repo has private runners available.
+      # To enable private jobs, you must add the following var and value to
+      # your gitlab repo by navigating to:
+      # settings -> CI/CD -> Environment variables
+      - $SUPPORT_PRIVATE_TEST == "yes"
+
+samba-fileserver:
+  extends: .private_template
+
+samba-ad-dc-1:
+  extends: .private_template
+
+samba-nt4:
+  extends: .private_template
+
+samba-schemaupgrade:
+  extends: .private_template