.gitlab-ci.yml: add docker tag back for private jobs
[samba.git] / .gitlab-ci.yml
index 4ae00a80433c2f7bd971eddb1988750e37dedfd7..8b9d0cb69bebb8aa2fcf76dd971fb91f79342da0 100644 (file)
@@ -1,17 +1,48 @@
 # see https://docs.gitlab.com/ce/ci/yaml/README.html for all available options
 
+stages:
+  - images
+  - build
 
 variables:
-  # we run autobuild.py inside a samba CI docker image located on gitlab's registry
-  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"
+  #
+  # we run autobuild.py inside a samba CI docker image located on gitlab's registry
+  # overwrite this variable if you want use your own image registry.
+  #
+  # Or better ask for access to the shared development repository, see
+  # https://wiki.samba.org/index.php/Samba_CI_on_gitlab#Getting_Access
+  #
+  SAMBA_CI_CONTAINER_REGISTRY: registry.gitlab.com/samba-team/devel/samba
+  #
+  # Set this to the contents of bootstrap/sha1sum.txt
+  # which is generated by bootstrap/template.py --render
+  #
+  SAMBA_CI_CONTAINER_TAG: 2be76362af215af6842e884abd5246dd9b50c283
+  # We use the ubuntu1804 image as default as
+  # it matches what we have on sn-devel-184.
+  SAMBA_CI_CONTAINER_IMAGE: ubuntu1804
+  #
+  # The following images are available
+  # Please see the samba-o3 sections at the end of this file!
+  # We should run that for each available image
+  #
+  SAMBA_CI_CONTAINER_IMAGE_ubuntu1804: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-ubuntu1804:${SAMBA_CI_CONTAINER_TAG}
+  SAMBA_CI_CONTAINER_IMAGE_ubuntu1604: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-ubuntu1604:${SAMBA_CI_CONTAINER_TAG}
+  SAMBA_CI_CONTAINER_IMAGE_debian9: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-debian9:${SAMBA_CI_CONTAINER_TAG}
+  SAMBA_CI_CONTAINER_IMAGE_opensuse150: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-opensuse150:${SAMBA_CI_CONTAINER_TAG}
+  SAMBA_CI_CONTAINER_IMAGE_fedora29: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-fedora29:${SAMBA_CI_CONTAINER_TAG}
+
+include:
+  # The image creation details are specified in a separate file
+  # See bootstrap/README.md for details
+  - 'bootstrap/.gitlab-ci.yml'
 
 .shared_template:
-  image: $SAMBA_CI_CONTAINER_IMAGE
+  variables:
+    AUTOBUILD_JOB_NAME: $CI_JOB_NAME
+  image: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-${SAMBA_CI_CONTAINER_IMAGE}:${SAMBA_CI_CONTAINER_TAG}
   stage: build
   tags:
     - docker
@@ -19,8 +50,23 @@ variables:
   before_script:
     - uname -a
     - lsb_release -a
+    - cat /etc/os-release
+    - mount
+    - df -h
+    - cat /proc/swaps
+    - free -h
+      # See bootstrap/.gitlab-ci.yml how to generate a new image
+    - echo "SAMBA_CI_CONTAINER_REGISTRY[${SAMBA_CI_CONTAINER_REGISTRY}]"
+    - echo "SAMBA_CI_CONTAINER_TAG[${SAMBA_CI_CONTAINER_TAG}]"
+    - bootstrap/template.py --sha1sum > /tmp/sha1sum-template.txt
+    - diff -u bootstrap/sha1sum.txt /tmp/sha1sum-template.txt
+    - echo "${SAMBA_CI_CONTAINER_TAG}" > /tmp/sha1sum-tag.txt
+    - diff -u bootstrap/sha1sum.txt /tmp/sha1sum-tag.txt
+    - diff -u bootstrap/sha1sum.txt /sha1sum.txt
+  after_script:
     - mount
     - df -h
+    - cat /proc/swaps
     - free -h
   artifacts:
     expire_in: 1 week
@@ -29,7 +75,6 @@ variables:
       - "*.stdout"
       - "*.stderr"
       - system-info.txt
-      - /tmp/samba-testbase/*/*/bin/config.log
   retry:
     max: 2
     when:
@@ -38,8 +83,8 @@ variables:
   script:
     # gitlab predefines CI_JOB_NAME for each job. The gitlab job usually matches the
     # autobuild name, which means we can define a default template that runs most autobuild jobs
-    - echo "Running cmd script/autobuild.py $CI_JOB_NAME --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase"
-    - script/autobuild.py $CI_JOB_NAME    --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+    - echo "Running cmd script/autobuild.py $AUTOBUILD_JOB_NAME --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase"
+    - script/autobuild.py $AUTOBUILD_JOB_NAME    --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
 others:
   extends: .shared_template
@@ -56,7 +101,6 @@ samba:
 
 samba-none-env:
   extends: .shared_template
-  # this one takes about 1 hours to finish
 
 samba-nopython:
   extends: .shared_template
@@ -70,9 +114,6 @@ samba-systemkrb5:
 samba-xc:
   extends: .shared_template
 
-samba-o3:
-  extends: .shared_template
-
 samba-ad-member:
   extends: .shared_template
 
@@ -91,9 +132,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,14 +149,12 @@ 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
+    - samba-ci-private
   only:
     variables:
       # These jobs are only run if the gitlab repo has private runners available.
@@ -129,10 +165,45 @@ 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
+
+#
+# We build samba-o3 on all supported distributions
+#
+
+.samba-o3-template:
+  extends: .shared_template
+  variables:
+    AUTOBUILD_JOB_NAME: samba-o3
+
+ubuntu1804-samba-o3:
+  extends: .samba-o3-template
+  image: $SAMBA_CI_CONTAINER_IMAGE_ubuntu1804
+
+ubuntu1604-samba-o3:
+  extends: .samba-o3-template
+  image: $SAMBA_CI_CONTAINER_IMAGE_ubuntu1604
+
+debian9-samba-o3:
+  extends: .samba-o3-template
+  image: $SAMBA_CI_CONTAINER_IMAGE_debian9
+
+opensuse150-samba-o3:
+  extends: .samba-o3-template
+  image: $SAMBA_CI_CONTAINER_IMAGE_opensuse150
+
+fedora29-samba-o3:
+  extends: .samba-o3-template
+  image: $SAMBA_CI_CONTAINER_IMAGE_fedora29
+
+#
+# Keep the samba-o3 sections at the end ...
+#