Attachment 14794 Details for Bug 13761 – 4.10 patch

[patch] 4.10 patch

rollup-nt4-CI-patches.patch (text/plain), 3.06 KB, created by Noel Power on 2019-01-24 09:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noel Power

Created: 2019-01-24 09:30:01 UTC

Size: 3.06 KB

patch

obsolete

>From 250c7a7f026d00aeefccf64a5c4883f8698ae524 Mon Sep 17 00:00:00 2001
>From: Ralph Boehme <slow@samba.org>
>Date: Mon, 21 Jan 2019 12:14:57 +0100
>Subject: [PATCH 1/2] CI: run "samba-nt4" as part of the free runners
>
>Looks like this got lost in the py2/py3 reshuffling around
>d01d85ccb255cbdfd3d379dfe0cd7ac58af7f284.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13761
>Signed-off-by: Ralph Boehme <slow@samba.org>
>
>Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
>Autobuild-Date(master): Wed Jan 23 12:41:32 CET 2019 on sn-devel-144
>
>(cherry picked from commit 574fdfae59c6d7c97be48ca52ac9aefac82feccd)
>---
> .gitlab-ci.yml | 5 +++++
> 1 file changed, 5 insertions(+)
>
>diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
>index 04d57cb0491..d3474db1a22 100644
>--- a/.gitlab-ci.yml
>+++ b/.gitlab-ci.yml
>@@ -35,6 +35,11 @@ build_samba_none_env_py2:
>     # this one takes about 1 hours to finish
>     - script/autobuild.py samba-none-env-py2    --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
> 
>+build_nt4:
>+  <<: *private_template
>+  script:
>+    - script/autobuild.py samba-nt4 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
>+
> build_samba_nopython:
>   <<: *shared_template
>   script:
>-- 
>2.16.4
>
>
>From ec5d4b1b76e1c5ada7206bcb184324f23e459086 Mon Sep 17 00:00:00 2001
>From: Ralph Boehme <slow@samba.org>
>Date: Wed, 23 Jan 2019 21:56:26 +0100
>Subject: [PATCH 2/2] CI: move target "build_nt4" to private gitlab runners
>
>Fixes the mistake of 574fdfae59c6d7c97be48ca52ac9aefac82feccd that added
>"build_nt4" to the public runners.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13761
>
>Signed-off-by: Ralph Boehme <slow@samba.org>
>Reviewed-by: Tim Beale <timbeale@catalyst.net.nz>
>
>Autobuild-User(master): Tim Beale <timbeale@samba.org>
>Autobuild-Date(master): Thu Jan 24 02:45:09 CET 2019 on sn-devel-144
>
>(cherry picked from commit 67fc683a3eec4d24de774e2a82c72b69eb03565e)
>---
> .gitlab-ci-private.yml | 4 ++++
> .gitlab-ci.yml         | 5 -----
> 2 files changed, 4 insertions(+), 5 deletions(-)
>
>diff --git a/.gitlab-ci-private.yml b/.gitlab-ci-private.yml
>index c3860685a80..ea22eaa044f 100644
>--- a/.gitlab-ci-private.yml
>+++ b/.gitlab-ci-private.yml
>@@ -39,3 +39,7 @@ build_samba_ad_dc_py2:
>     # this one takes about 1 hours to finish
>     - script/autobuild.py samba-ad-dc-py2     --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
> 
>+build_nt4:
>+  <<: *private_template
>+  script:
>+    - script/autobuild.py samba-nt4 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
>diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
>index d3474db1a22..04d57cb0491 100644
>--- a/.gitlab-ci.yml
>+++ b/.gitlab-ci.yml
>@@ -35,11 +35,6 @@ build_samba_none_env_py2:
>     # this one takes about 1 hours to finish
>     - script/autobuild.py samba-none-env-py2    --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
> 
>-build_nt4:
>-  <<: *private_template
>-  script:
>-    - script/autobuild.py samba-nt4 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
>-
> build_samba_nopython:
>   <<: *shared_template
>   script:
>-- 
>2.16.4
>

Actions: View

Attachments on bug 13761: 14793 | 14794