From a5850ff1893fee40ecde2147f916f60a46a11c12 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 14 Jun 2018 16:05:57 +0200 Subject: [PATCH] break out autopkgtest into a standalone script --- Dockerfile | 1 + gitlab-ci-autopkgtest | 16 ++++++++++++++++ gitlab-ci-git-buildpackage | 4 ++-- 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100755 gitlab-ci-autopkgtest diff --git a/Dockerfile b/Dockerfile index d30501b..8067d54 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,6 +28,7 @@ RUN mkdir -p /usr/share/man/man1 \ COPY gitlab-ci-git-buildpackage / COPY gitlab-ci-common /usr/share/ COPY gitlab-ci-aptly /usr/bin/ +COPY gitlab-ci-autopkgtest /usr/bin/ COPY gitlab-ci-lintian /usr/bin/ COPY gitlab-ci-enable-sid /usr/bin/ COPY gitlab-ci-enable-experimental /usr/bin/ diff --git a/gitlab-ci-autopkgtest b/gitlab-ci-autopkgtest new file mode 100755 index 0000000..a00b70e --- /dev/null +++ b/gitlab-ci-autopkgtest @@ -0,0 +1,16 @@ +#!/bin/bash -e + +. /usr/share/gitlab-ci-common + +! test -z "$CI_PROJECT_DIR" + +set -x + +$apt_get update +$apt_get install autopkgtest autodep8 + +if [ ! -e $CI_PROJECT_DIR/debian/tests/control ]; then + autodep8 +fi + +autopkgtest $CI_PROJECT_DIR/../*.changes -- null diff --git a/gitlab-ci-git-buildpackage b/gitlab-ci-git-buildpackage index 0849a7e..3c8c076 100755 --- a/gitlab-ci-git-buildpackage +++ b/gitlab-ci-git-buildpackage @@ -53,8 +53,8 @@ if [[ ! -f $lockfile ]] ; then gitlab-ci-lintian - if [ -e debian/tests/control ]; then - autopkgtest ../*.changes -- null + if [ -e $CI_PROJECT_DIR/debian/tests/control ]; then + gitlab-ci-autopkgtest fi fi