[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  b9924839ce6 gitlab-ci: Use artifacts instead of after_script
       via  5aee11c2869 gitlab-ci: Move before and after script to shared template
       via  8989916b5af gitlab-ci: Move the image definition to the template
      from  80685fd823f s4:libcli: Remove (now unused) pysmb.c bindings

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


- Log -----------------------------------------------------------------
commit b9924839ce6c4f8da56566fb0193a626696ab55b
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Nov 20 08:17:37 2018 +0100

    gitlab-ci: Use artifacts instead of after_script
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Sat Jan 26 22:16:38 CET 2019 on sn-devel-144

commit 5aee11c28693270aebc2abe5962fcca9d4cb4626
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Nov 20 08:16:42 2018 +0100

    gitlab-ci: Move before and after script to shared template
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 8989916b5af6fed9c4c63035d4488583396b8c5a
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Nov 20 08:15:02 2018 +0100

    gitlab-ci: Move the image definition to the template
    
    And in addition use variables for defining project and build env.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

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

Summary of changes:
 .gitlab-ci.yml | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 04d57cb0491..5cc21033f53 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,27 +1,33 @@
 # see https://docs.gitlab.com/ce/ci/yaml/README.html for all available options
 
-image: registry.gitlab.com/samba-team/samba:latest
 
 variables:
+  SAMBA_BUILD_IMAGES_PROJECT: samba-team/samba
+  SAMBA_BUILD: latest
   GIT_STRATEGY: fetch
   GIT_DEPTH: "3"
 
-before_script:
-  - echo "Build starting (preparing swap)..."
-  - if [ $(df -m / --output=avail | tail -n1) -gt 10240 ]; then
-      sudo dd if=/dev/zero of=/samba-swap bs=1M count=6144;
-      sudo mkswap /samba-swap;
-      sudo swapon /samba-swap;
-    fi
-
-after_script:
-  - tar -xf logs.tar.gz system-info.txt -O
-
 .shared_template: &shared_template
+  image: $CI_REGISTRY/$SAMBA_BUILD_IMAGES_PROJECT:$SAMBA_BUILD
   stage: build
   tags:
     - docker
     - shared
+  before_script:
+    - echo "Build starting (preparing swap)..."
+    - if [ $(df -m / --output=avail | tail -n1) -gt 10240 ]; then
+        sudo dd if=/dev/zero of=/samba-swap bs=1M count=6144;
+        sudo mkswap /samba-swap;
+        sudo swapon /samba-swap;
+      fi
+  artifacts:
+    expire_in: 1 week
+    when: on_failure
+    paths:
+      - "*.stdout"
+      - "*.stderr"
+      - system-info.txt
+      - /tmp/samba-testbase/*/*/bin/config.log
 
 build_samba_none_env:
   <<: *shared_template


-- 
Samba Shared Repository