* debian/gitlab-ci.yml: Updated.

debian/changelog

@@ -1,8 +1,7 @@
 patroni (1.5.0-4) UNRELEASED; urgency=medium
 
   [ Michael Banck ]
-  * debian/gitlab-ci.yml: Run origtargz as `builduser' user during the .build
-    stage and without during the .test stage.
+  * debian/gitlab-ci.yml: Updated.
   * debian/patches/check_postmaster.patch: New patch, replaces the process
     creation time check for postmaster presense with sending signal 0, similar
     to what pg_ctl does.  Closes: #909532.

debian/gitlab-ci.yml

@@ -1,45 +1,50 @@
 stages:
   - build
   - autopkgtest
+
 .build: &build
-  before_script:
-  - apt-get update
-  - apt-get -y install devscripts adduser fakeroot sudo
-  - mk-build-deps -t "apt-get -y -o Debug::pkgProblemResolver=yes --no-install-recommends" -i -r
-  - adduser --disabled-password --gecos "" builduser
-  - chown -R builduser:builduser .
-  - chown builduser:builduser ..
-  - sudo -u builduser origtargz
   stage: build
+  before_script:
+    # allow origtargz to use 'apt-get source'
+    - sed -e 's/^deb /deb-src /' /etc/apt/sources.list > /etc/apt/sources.list.d/src.list
+    - apt-get -q update
+    - apt-get -y --no-install-recommends install devscripts fakeroot liblwp-protocol-https-perl libwww-perl
+    - apt-get -y --no-install-recommends build-dep .
+    - useradd builduser
+    - chown -R builduser:builduser .
+    - chown builduser:builduser ..
+    - su -c 'origtargz' builduser
+  script:
+    - su -c 'dpkg-buildpackage --no-sign -sa -rfakeroot' builduser
+  after_script:
+    - rm -rf .built && mkdir .built
+    - dcmd mv ../*.changes .built/
   artifacts:
     paths:
-    - .built
-  script:
-  - sudo -u builduser dpkg-buildpackage -b -rfakeroot
-  after_script:
-  - mkdir .built
-  - dcmd mv ../*ges .built/
+      - .built
+
 .test: &test
-  before_script:
-  - apt-get update
-  - apt-get -y install devscripts autopkgtest
-  - origtargz
   stage: autopkgtest
+  before_script:
+    - apt-get -q update -q
+    - apt-get -y --no-install-recommends install autopkgtest autodep8
   script:
-  - autopkgtest .built/*ges -- null
+    - autopkgtest .built/*.changes -- null
+
 build:testing:
   <<: *build
   image: debian:testing
 build:unstable:
   <<: *build
   image: debian:sid
+
 test:testing:
   <<: *test
   dependencies:
-  - build:testing
+    - build:testing
   image: debian:testing
 test:unstable:
   <<: *test
   dependencies:
-  - build:unstable
+    - build:unstable
   image: debian:sid