[SCM] Samba Shared Repository - branch master updated

[Ralph Böhme]

The branch, master has been updated
       via  45fee29d1ed .gitlab-ci.yml: require samba-ci-private tag for our private runners
       via  b369fabaa6f .gitlab-ci.yml: remove outdated comments
       via  67b16058208 .gitlab-ci.yml: run samba-schemaupgrade on the private runner
      from  e3c894fb6b8 lib/replace: define NAME_MAX for platforms that don't have it

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 45fee29d1ed8e4baa3e1c4af9e54c1b9cb34f639
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Apr 12 21:24:27 2019 +0200

    .gitlab-ci.yml: require samba-ci-private tag for our private runners
    
    This makes it more clear that we need our own private runners.
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Tue Apr 16 17:45:35 UTC 2019 on sn-devel-144

commit b369fabaa6f0593fb2c440a363af92d43be8c0b8
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Apr 12 21:23:53 2019 +0200

    .gitlab-ci.yml: remove outdated comments
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

commit 67b16058208c8ba06a8467e2bbd53a307e36de43
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Apr 16 14:54:55 2019 +0200

    .gitlab-ci.yml: run samba-schemaupgrade on the private runner
    
    The related jobs often fail with timeouts
    because the shared runners (4GB RAM + 2GB SWAP)
    will use ~450MB of the swapfile.
    
    The private runners use 8GB RAM without any swap.
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 .gitlab-ci.yml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2504cd46a23..505df7cdbe3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,7 +63,6 @@ samba:
 
 samba-none-env:
   extends: .shared_template
-  # this one takes about 1 hours to finish
 
 samba-nopython:
   extends: .shared_template
@@ -98,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
 
@@ -118,14 +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
+    - samba-ci-private
   only:
     variables:
       # These jobs are only run if the gitlab repo has private runners available.
@@ -136,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


-- 
Samba Shared Repository