From 188035f0e3ad897d94d31deef2ad12adc044e18e Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 15 May 2018 15:27:44 +0200
Subject: [PATCH] test: do actual run using gitlab-runner

https://gitlab.com/gitlab-org/gitlab-runner/issues/2438#note_34431388
---
 .gitlab-ci.yml | 35 ++++++++++++++++++++++++++++++++++-
 Dockerfile     |  2 --
 test           |  3 ---
 3 files changed, 34 insertions(+), 6 deletions(-)
 delete mode 100755 test

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65069ec..70cfe67 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,7 @@ stages:
 variables:
   TEST_IMAGE: ${CI_REGISTRY_IMAGE}:$CI_BUILD_REF_NAME
   RELEASE_IMAGE: ${CI_REGISTRY_IMAGE}:latest
+  GITLAB_RUNNER_IMAGE: gitlab/gitlab-runner:alpine
 
 before_script:
   - echo $CI_BUILD_TOKEN | docker login -u gitlab-ci-token --password-stdin ${CI_REGISTRY}
@@ -17,13 +18,45 @@ before_script:
 build:
   stage: build
   script:
+    - echo Building ${RELEASE_IMAGE}
     - docker build -t $TEST_IMAGE .
     - docker push $TEST_IMAGE
 
 test:
   stage: test
+  variables:
+    CI_CONFIG_PATH: debian/.gitlab-ci.yml
   script:
-    - docker run $TEST_IMAGE /test
+    - echo Testing ${RELEASE_IMAGE}
+    - docker pull ${GITLAB_RUNNER_IMAGE}
+    - docker run --rm --interactive
+        --volume /var/run/docker.sock:/var/run/docker.sock
+        ${GITLAB_RUNNER_IMAGE}
+        exec docker --help
+    - git clone https://salsa.debian.org/debian/pidcat.git
+    - cd pidcat
+    - printf
+        "image\x3a ${TEST_IMAGE}\n\ntest:\n  script:\n    - /gitlab-ci-git-buildpackage\n"
+        > $CI_CONFIG_PATH
+    - git add $CI_CONFIG_PATH
+    - git config user.name $GITLAB_USER_NAME
+    - git config user.email $GITLAB_USER_EMAIL
+    - git commit $CI_CONFIG_PATH -m $CI_CONFIG_PATH
+    - cat $CI_CONFIG_PATH
+    - docker run --rm --interactive
+        --volume /var/run/docker.sock:/var/run/docker.sock
+        --volume $PWD:$PWD --workdir $PWD
+        --env "CI_CONFIG_PATH=$CI_CONFIG_PATH"
+        ${GITLAB_RUNNER_IMAGE}
+        exec docker
+          --docker-volumes "/var/run/docker.sock:/var/run/docker.sock"
+          --env "HOSTNAME=$HOSTNAME"
+          --env "CI_PROJECT_NAMESPACE=debian"
+          --env "CI_PROJECT_NAME=pidcat"
+          --env "CI_COMMIT_REF_NAME=`git symbolic-ref HEAD --short`"
+          --env "CI_COMMIT_SHA=`git rev-parse HEAD`"
+          --env "CI_CONFIG_PATH=$CI_CONFIG_PATH"
+          test
 
 release:
   stage: release
diff --git a/Dockerfile b/Dockerfile
index 3399a4b..6487c22 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,8 +21,6 @@ RUN mkdir -p /usr/share/man/man1 \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists/*
 
-COPY test /
-
 COPY gitlab-ci-git-buildpackage /
 
 ENTRYPOINT ["/gitlab-ci-git-buildpackage"]
diff --git a/test b/test
deleted file mode 100755
index 5f486d8..0000000
--- a/test
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-gbp --version