From 61a5b0173ff015daf8419ed3df2cb24b2206d263 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 14 Jun 2018 15:34:38 +0200 Subject: [PATCH] require GitLab CI session to run these scripts These scripts assume things that you only get while running in a CI Docker container, like root access and state that is reset everytime. --- Dockerfile | 1 + gitlab-ci-common | 6 ++++++ gitlab-ci-enable-experimental | 2 ++ gitlab-ci-enable-sid | 2 ++ gitlab-ci-git-buildpackage | 2 ++ 5 files changed, 13 insertions(+) create mode 100644 gitlab-ci-common diff --git a/Dockerfile b/Dockerfile index 2bbab35..9c8cf15 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,6 +26,7 @@ RUN mkdir -p /usr/share/man/man1 \ && rm -rf /var/lib/apt/lists/* COPY gitlab-ci-git-buildpackage / +COPY gitlab-ci-common /usr/share/ COPY gitlab-ci-enable-sid /usr/bin/ COPY gitlab-ci-enable-experimental /usr/bin/ diff --git a/gitlab-ci-common b/gitlab-ci-common new file mode 100644 index 0000000..fb92733 --- /dev/null +++ b/gitlab-ci-common @@ -0,0 +1,6 @@ + +if [ -z "$CI" ]; then + echo "This script should only ever be run in GitLab CI!" + exit 1 +fi + diff --git a/gitlab-ci-enable-experimental b/gitlab-ci-enable-experimental index b9ed9e4..fa214f1 100755 --- a/gitlab-ci-enable-experimental +++ b/gitlab-ci-enable-experimental @@ -1,5 +1,7 @@ #!/bin/bash -e +. /usr/share/gitlab-ci-common + printf "Package: *\nPin: release o=Debian,a=stable\nPin-Priority: 900\n" \ > /etc/apt/preferences.d/debian-stable.pref diff --git a/gitlab-ci-enable-sid b/gitlab-ci-enable-sid index bf135b5..09be8ff 100755 --- a/gitlab-ci-enable-sid +++ b/gitlab-ci-enable-sid @@ -1,5 +1,7 @@ #!/bin/bash -e +. /usr/share/gitlab-ci-common + printf "Package: *\nPin: release o=Debian,a=stable\nPin-Priority: 900\n" \ > /etc/apt/preferences.d/debian-stable.pref diff --git a/gitlab-ci-git-buildpackage b/gitlab-ci-git-buildpackage index 384ff5f..11ed984 100755 --- a/gitlab-ci-git-buildpackage +++ b/gitlab-ci-git-buildpackage @@ -5,6 +5,8 @@ if [ "$CI_COMMIT_REF_NAME" == "upstream" ] || [ "$CI_COMMIT_REF_NAME" == "pristi exit 0 fi +. /usr/share/gitlab-ci-common + # https://gitlab.com/gitlab-org/gitlab-runner/issues/1380#note_48552305 lockfile=/.lock if [[ ! -f $lockfile ]] ; then