Merge branch 'pu/gitlab-ci' into 'master'

Pu/gitlab ci

See merge request apt-team/apt!17

3 files changed, 35 insertions, 2 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 000000000..0ebff095c
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,33 @@
+image: debian:testing
+
+test as root:
+  stage: test
+  script:
+    - adduser --home /home/travis travis --quiet --disabled-login --gecos "" --uid 1000
+    - rm -f /etc/dpkg/dpkg.cfg.d/excludes
+    - apt-get update
+    - apt-get install -qq build-essential expect gcovr sudo
+    - chmod -R o+rwX $PWD
+    - ./prepare-release travis-ci
+    - sudo -u travis mkdir build
+    - sudo -u travis env -C build cmake -DCMAKE_BUILD_TYPE=Coverage -G Ninja ..
+    - sudo -u travis ninja -C build
+    - CTEST_OUTPUT_ON_FAILURE=1 ninja -C build test
+    - unbuffer ./test/integration/run-tests -q -j 4
+    - gcovr
+
+test as user:
+  stage: test
+  script:
+    - adduser --home /home/travis travis --quiet --disabled-login --gecos "" --uid 1000
+    - rm -f /etc/dpkg/dpkg.cfg.d/excludes
+    - apt-get update
+    - apt-get install -qq build-essential expect gcovr sudo
+    - chmod -R o+rwX $PWD
+    - ./prepare-release travis-ci
+    - sudo -u travis mkdir build
+    - sudo -u travis env -C build cmake -DCMAKE_BUILD_TYPE=Coverage -G Ninja ..
+    - sudo -u travis ninja -C build
+    - sudo -u travis CTEST_OUTPUT_ON_FAILURE=1 ninja -C build test
+    - sudo -u travis unbuffer ./test/integration/run-tests -q -j 4
+    - sudo -u travis gcovr
diff --git a/test/integration/test-bug-611729-mark-as-manual b/test/integration/test-bug-611729-mark-as-manual
index 97ef846e3..4bcd25f0f 100755
--- a/test/integration/test-bug-611729-mark-as-manual
+++ b/test/integration/test-bug-611729-mark-as-manual
@@ -56,7 +56,7 @@ testdpkginstalled b c
 testmarkedauto 'b'
 
 sed -i rootdir/var/log/apt/history.log -e '/^Commandline: / d' -e '/^Start-Date: / d' -e '/^End-Date: / d'
-if [ -n "$SUDO_USER" ]; then
+if [ -n "$SUDO_USER" -a "$(id -u "$SUDO_USER")" -gt 0 ]; then
 	testfileequal 'rootdir/var/log/apt/history.log' "
 Requested-By: $SUDO_USER ($(id -u "$SUDO_USER"))
 Reinstall: b:i386 (1.0)"
diff --git a/test/integration/test-disappearing-packages b/test/integration/test-disappearing-packages
index e8748e6bc..b27755361 100755
--- a/test/integration/test-disappearing-packages
+++ b/test/integration/test-disappearing-packages
@@ -60,7 +60,7 @@ all files have been overwritten by other packages:
 Note: This is done automatically and on purpose by dpkg.' tail -n 4 disappear.output
 
 sed -i rootdir/var/log/apt/history.log -e '/^Commandline: / d' -e '/^Start-Date: / d' -e '/^End-Date: / d' -e "s#:$(getarchitecture 'native') #:native #"
-if [ -n "$SUDO_USER" ]; then
+if [ -n "$SUDO_USER" -a "$(id -u "$SUDO_USER")" -gt 0  ]; then
 	testfileequal 'rootdir/var/log/apt/history.log' "
 Requested-By: $SUDO_USER ($(id -u "$SUDO_USER"))
 Install: old-pkg:native (1)