[Pkg-samba-maint] [Git][samba-team/samba][master] 3 commits: Remove workaround for gitlab include

[Mathieu Parent]

Mathieu Parent pushed to branch master at Debian Samba Team / samba


Commits:
3ca272de by Salsa Pipeline Bot at 2018-11-09T06:43:44Z
Remove workaround for gitlab include

Gbp-Dch: Ignore

- - - - -
9c6c81b8 by Salsa Pipeline Bot at 2018-11-09T06:43:44Z
Update pipeline

Gbp-Dch: Ignore

- - - - -
dc9a0d77 by Mathieu Parent at 2018-11-10T13:21:14Z
Merge branch 'salsa-ci-1541745824' into 'master'

Update salsa-ci pipeline

See merge request samba-team/samba!13
- - - - -


2 changed files:

- debian/gitlab-ci.yml
- − debian/gitlab-ci.yml.tpl


Changes:

=====================================
debian/gitlab-ci.yml
=====================================
@@ -1,77 +1,16 @@
-# Warning! This file is autogenerated by salsa pipeline bot. Any change made
-# over this document will be lost. Customization and changes must be made over
-# the template yaml.
-variables:
-  DEBFULLNAME: "Salsa Pipeline"
-  DEBEMAIL: "<salsa-pipeline at debian.org>"
-  DEBIAN_FRONTEND: noninteractive
-  WORKING_DIR: ./debian/output
+include: https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
 
-stages:
-  - build
-  - test
+build:
+    extends: .build-unstable
 
-image: debian:unstable
+reprotest:
+    extends: .test-reprotest
 
-build package:
-  stage: build
-  image: registry.salsa.debian.org/salsa-ci-team/images/gbp
-  services:
-    - docker:dind
-  artifacts:
-    expire_in: 180 day
-    name: "$CI_BUILD_NAME"
-    paths:
-        - ${WORKING_DIR}/
-  script:
-    - gbp pull --ignore-branch --pristine-tar --track-missing
-    - gbp buildpackage --git-ignore-branch --git-export-dir=${WORKING_DIR} --git-builder='docker-build.sh registry.salsa.debian.org/salsa-ci-team/images/dockerbuilder'
+lintian:
+    extends: .test-lintian
 
-run autopkgtest:
-  stage: test
-  image: registry.salsa.debian.org/salsa-ci-team/images/autopkgtest
-  script:
-    - eatmydata autopkgtest -U ${WORKING_DIR}/*.deb -- null
+autopkgtest:
+    extends: .test-autopkgtest
 
-run lintian:
-  stage: test
-  image: registry.salsa.debian.org/salsa-ci-team/images/lintian
-  script:
-    - lintian -iI ${WORKING_DIR}/*.changes
-
-run reprotest:
-  stage: test
-  image: registry.salsa.debian.org/salsa-ci-team/images/reprotest
-  artifacts:
-    name: "$CI_BUILD_NAME"
-    expire_in: 180 day
-    paths:
-      - ./reprotest.log
-    when: always
-  script:
-    - apt-get update
-    - eatmydata apt-get build-dep -y .
-    - export DEB_BUILD_OPTIONS=nocheck
-    - eatmydata reprotest --no-diffoscope --min-cpus $(nproc --all) . -- null &> reprotest.log
-
-run piuparts:
-  stage: test
-  image: registry.salsa.debian.org/sathieu/images/piuparts
-  services:
-    - docker:dind
-  script:
-    - CHROOT_PATH=/tmp/debian-unstable
-    - CONTAINER_ID=$(docker run --rm -d debian:unstable sleep infinity)
-    - docker exec ${CONTAINER_ID} bash -c "apt-get update && apt-get install eatmydata -y"
-    - mkdir -p ${CHROOT_PATH}
-    - docker export ${CONTAINER_ID} | tar -C ${CHROOT_PATH} -xf -
-    - mknod -m 666 ${CHROOT_PATH}/dev/urandom c 1 9
-    - mkdir -p ${CHROOT_PATH}/etc-target/apt/sources.list.d ${CHROOT_PATH}/etc-target/apt/preferences.d
-    - cp -aTv /etc/apt/sources.list.d  ${CHROOT_PATH}/etc-target/apt/sources.list.d
-    - cp -aTv /etc/apt/preferences.d  ${CHROOT_PATH}/etc-target/apt/preferences.d
-    - piuparts --scriptsdir /etc/piuparts/scripts --allow-database --warn-on-leftovers-after-purge --hard-link -e ${CHROOT_PATH} ${WORKING_DIR}/*.deb
-# End of include
-#################################### Below starts the local customization ###################################
-before_script:
-  - echo 'deb http://deb.debian.org/debian experimental main' > /etc/apt/sources.list.d/experimental.list
-  - "echo 'Package: ldb-tools libldb* python*-ldb*\nPin: release a=experimental\nPin-Priority: 500' > /etc/apt/preferences.d/experimental.pref"
+piuparts:
+    extends: .test-piuparts


=====================================
debian/gitlab-ci.yml.tpl deleted
=====================================
@@ -1,6 +0,0 @@
-include: https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
-
-# end of salsa pipeline bot parser
-before_script:
-  - echo 'deb http://deb.debian.org/debian experimental main' > /etc/apt/sources.list.d/experimental.list
-  - "echo 'Package: ldb-tools libldb* python*-ldb*\nPin: release a=experimental\nPin-Priority: 500' > /etc/apt/preferences.d/experimental.pref"



View it on GitLab: https://salsa.debian.org/samba-team/samba/compare/daa4d0f558aed843a75ca03a6a47f9ee9b82ffb0...dc9a0d77f6da2e222323115dea3799d90c6697e6

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/compare/daa4d0f558aed843a75ca03a6a47f9ee9b82ffb0...dc9a0d77f6da2e222323115dea3799d90c6697e6
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-samba-maint/attachments/20181110/083ddb47/attachment-0001.html>