Attachment 14838 Details for Bug 13780 – Fix backport for v4.10

[patch] Fix backport for v4.10

v4-10-patch.txt (text/plain), 2.97 KB, created by Tim Beale on 2019-02-08 04:11:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Beale

Created: 2019-02-08 04:11:18 UTC

Size: 2.97 KB

patch

obsolete

>From 01ef68f2544c13734e62d66fa7ec5b227bbbd08f Mon Sep 17 00:00:00 2001
>From: Tim Beale <timbeale@catalyst.net.nz>
>Date: Tue, 5 Feb 2019 15:17:03 +1300
>Subject: [PATCH] autobuild: Split backup/restore testenvs out into separate
> job
>
>The samba-ad-dc-2 job was reaching its limits with the number of
>testenvs and what the resource-limited CI machines can handle.
>Samba processes were getting swapped out of memory, causing CI runs
>to fail.
>
>This patch splits the backup/restore testenv targets into a separate
>autobuild job: samba-ad-dc-backup.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13780
>
>Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
>Reviewed-by: Stefan Metzmacher <metze@samba.org>
>
>Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
>Autobuild-Date(master): Tue Feb  5 12:23:31 CET 2019 on sn-devel-144
>
>(cherry picked from commit 95b2c9d7751ae1e5a00e1fb096f045dd73c03d72)
>---
> .gitlab-ci.yml      |  5 +++++
> script/autobuild.py | 12 ++++++++++++
> 2 files changed, 17 insertions(+)
>
>diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
>index 04d57cb..7036694 100644
>--- a/.gitlab-ci.yml
>+++ b/.gitlab-ci.yml
>@@ -61,6 +61,11 @@ build_samba_ad_dc_2:
>     # this one takes about 1 hours to finish
>     - script/autobuild.py samba-ad-dc-2     --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
> 
>+build_samba_ad_dc_backup:
>+  <<: *shared_template
>+  script:
>+    - script/autobuild.py samba-ad-dc-backup    --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
>+
> build_samba_ad_dc_2_py2:
>   <<: *shared_template
>   script:
>diff --git a/script/autobuild.py b/script/autobuild.py
>index 2ea9e55..00f0d22 100755
>--- a/script/autobuild.py
>+++ b/script/autobuild.py
>@@ -51,6 +51,7 @@ builddirs = {
>     "samba-ad-dc-py2": ".",
>     "samba-ad-dc-2": ".",
>     "samba-ad-dc-2-py2": ".",
>+    "samba-ad-dc-backup": ".",
>     "samba-systemkrb5": ".",
>     "samba-nopython": ".",
>     "samba-buildpy2-only": ".",
>@@ -166,6 +167,17 @@ tasks = {
>                          "--include-env=vampire_2000_dc "
>                          "--include-env=fl2000dc "
>                          "--include-env=ad_dc_no_nss "
>+                         "'",
>+                         "text/plain"),
>+                        ("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
>+
>+    # run the backup/restore testenvs separately as they're fairly standalone
>+    # (and CI seems to max out at ~8 different DCs running at once)
>+    "samba-ad-dc-backup": [("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
>+                        ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
>+                        ("make", "make -j", "text/plain"),
>+                        ("test", "make test FAIL_IMMEDIATELY=1 "
>+                         "TESTS='${PY3_ONLY}"
>                          "--include-env=backupfromdc "
>                          "--include-env=restoredc "
>                          "--include-env=renamedc "
>-- 
>2.7.4
>

Flags:

abartlet: review+

Actions: View

Attachments on bug 13780: 14838 | 14915