s4/selftest: Enable samba.tests.samba_tool.join for py3

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9c52057971c49c5f36878332ed7bd1f525e2e0ec..9aa9fb28ccf44f5c27f355f242390652d4d79029 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,94 +14,91 @@ 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
+after_script:
+  - tar -xf logs.tar.gz system-info.txt -O
 
-build_samba_nt4:
+.shared_template: &shared_template
   stage: build
   tags:
     - docker
-    - private
+    - shared
+
+build_samba_none_env:
+  <<: *shared_template
   script:
     # this one takes about 1 hours to finish
-    - python script/autobuild.py samba-nt4        --verbose --tail --testbase /tmp/samba-testbase
+    - python script/autobuild.py samba-none-env    --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
-build_samba_fileserver:
-  stage: build
-  tags:
-    - docker
-    - private
+build_samba_none_env_py3:
+  <<: *shared_template
   script:
     # this one takes about 1 hours to finish
-    - python script/autobuild.py samba-fileserver --verbose --tail --testbase /tmp/samba-testbase
+    - python script/autobuild.py samba-none-env-py3 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
-build_samba_ad_dc:
-  stage: build
-  tags:
-    - docker
-    - private
+build_samba_nopython:
+  <<: *shared_template
   script:
-    # this one takes about 1 hours to finish
-    - python script/autobuild.py samba-ad-dc     --verbose --tail --testbase /tmp/samba-testbase
+    - python script/autobuild.py samba-nopython   --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+
+build_samba_systemkrb5:
+  <<: *shared_template
+  script:
+    - python script/autobuild.py samba-systemkrb5 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+
+build_samba_xc:
+  <<: *shared_template
+  script:
+    - python script/autobuild.py samba-xc         --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+
+build_samba_o3:
+  <<: *shared_template
+  script:
+    - python script/autobuild.py samba-o3         --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
 build_samba_ad_dc_2:
-  stage: build
-  tags:
-    - docker
-    - private
+  <<: *shared_template
   script:
     # this one takes about 1 hours to finish
-    - python script/autobuild.py samba-ad-dc-2     --verbose --tail --testbase /tmp/samba-testbase
+    - python script/autobuild.py samba-ad-dc-2     --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
-build_samba_none_env:
-  stage: build
-  tags:
-    - docker
-    - shared
+build_samba_ad_dc_2_py3:
+  <<: *shared_template
   script:
     # this one takes about 1 hours to finish
-    - python script/autobuild.py samba-none-env    --verbose --tail --testbase /tmp/samba-testbase
+    - python script/autobuild.py samba-ad-dc-2-py3 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
-build_samba_others:
-  stage: build
-  tags:
-    - docker
-    - shared
+build_samba_libs:
+  <<: *shared_template
+  script:
+    - python script/autobuild.py samba-libs       --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+
+build_samba_libs_py3:
+  <<: *shared_template
+  script:
+    - python script/autobuild.py samba-libs-py3   --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+
+build_samba_static:
+  <<: *shared_template
   script:
-    - python script/autobuild.py samba-nopython   --verbose --tail --testbase /tmp/samba-testbase
-    - python script/autobuild.py samba-systemkrb5 --verbose --tail --testbase /tmp/samba-testbase
-    - python script/autobuild.py samba-xc         --verbose --tail --testbase /tmp/samba-testbase
-    - python script/autobuild.py samba-o3         --verbose --tail --testbase /tmp/samba-testbase
-    - python script/autobuild.py samba-libs       --verbose --tail --testbase /tmp/samba-testbase
-    - python script/autobuild.py samba-static     --verbose --tail --testbase /tmp/samba-testbase
+    - python script/autobuild.py samba-static     --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
 build_ctdb:
-  stage: build
-  tags:
-    - docker
-    - shared
+  <<: *shared_template
+  script:
+    - python script/autobuild.py samba-ctdb       --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+
+build_samba_ctdb:
+  <<: *shared_template
   script:
-    - python script/autobuild.py samba-ctdb       --verbose --tail --testbase /tmp/samba-testbase
-    - python script/autobuild.py ctdb             --verbose --tail --testbase /tmp/samba-testbase
+    - python script/autobuild.py ctdb             --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
 build_others:
-  stage: build
-  tags:
-    - docker
-    - shared
+  <<: *shared_template
   script:
-    - python script/autobuild.py ldb              --verbose --tail --testbase /tmp/samba-testbase
-    - python script/autobuild.py pidl             --verbose --tail --testbase /tmp/samba-testbase
-    - python script/autobuild.py replace          --verbose --tail --testbase /tmp/samba-testbase
-    - python script/autobuild.py talloc           --verbose --tail --testbase /tmp/samba-testbase
-    - python script/autobuild.py tdb              --verbose --tail --testbase /tmp/samba-testbase
-    - python script/autobuild.py tevent           --verbose --tail --testbase /tmp/samba-testbase
+    - python script/autobuild.py ldb              --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+    - python script/autobuild.py pidl             --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+    - python script/autobuild.py replace          --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+    - python script/autobuild.py talloc           --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+    - python script/autobuild.py tdb              --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+    - python script/autobuild.py tevent           --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
-after_script:
-  - echo "Build finished!"