Merge branch 'gitlab-ci-fix' into 'stretch'

Import gitlab-ci fix

See merge request sympl.host/sympl!3

.gitlab-ci.yml

@@ -6,12 +6,15 @@ stages:
 
 .test: &test
   stage: test
-  image: $CI_REGISTRY/docker-images/layers:stretch-ruby
+  image: debian:stretch
   script:
+    - apt-get update && apt-get install -q -yy rake devscripts rdoc graphviz ruby-dev
+    - curl -L https://secure.bytemark.co.uk/key/repositories-2006.key | apt-key add -
+    - curl -L https://secure.bytemark.co.uk/key/repositories-2014.key | apt-key add -
     - adduser --home=/srv --shell=/bin/bash --no-create-home --disabled-login --gecos='Symbiosis Administrator,,,' admin
     - chown admin.admin /srv
     - cp test/internal-test.d/conf-stretch/sources.list /etc/apt/sources.list.d/
-    - "[ -z \"$TEST_DEPS\" ] || (apt-get update ; apt-get install $TEST_DEPS)"
+    - "[ -z \"$TEST_DEPS\" ] || (apt-get update ; apt-get install -q -yy $TEST_DEPS)"
     - export PACKAGE=${CI_BUILD_NAME##test:}
     - cd $PACKAGE
     - "[ ! -f Makefile ] || make test"
@@ -80,15 +83,20 @@ test:xmpp:
   <<: *test
 
 .package: &package
-  image: $CI_REGISTRY/docker-images/layers:stretch-deb
+  image: debian:stretch
   stage: package
   script:
-    - cp symbiosis.list /etc/apt/sources.list.d/
-    - apt-get update
+    - apt-get update && apt-get install -q -yy rake devscripts rdoc graphviz ruby-dev
+    - curl -L https://secure.bytemark.co.uk/key/repositories-2006.key | apt-key add -
+    - curl -L https://secure.bytemark.co.uk/key/repositories-2014.key | apt-key add -
+    - apt-get update && apt-get install -q -yy gem2deb txt2man dh-systemd apache2-dev libcap-dev php7.0-common dh-golang golang-go
     - export PACKAGE=${CI_BUILD_NAME##package:}
     - echo "$CI_BUILD_NAME" -  "$PACKAGE" - "${CI_BUILD_NAME##package:}"
     - cd $PACKAGE
-    - package
+    - dpkg-buildpackage --no-sign --build=full
+    - cd ..
+    - mkdir pkg
+    - mv $(git ls-files --others -x '*/') pkg
   artifacts:
     paths:
       - pkg/
@@ -126,14 +134,17 @@ package:webmail:
 package:xmpp:
   <<: *package
 
+# We publish to an artifact that should be usable as a Debian repository as-is
 publish:
+  image: debian:stretch
   stage: publish
-  variables:
-    RSYNC_HOSTNAME: repo.bytemark.co.uk
-  tags:
-    - shell
   script:
-    - publish
+    - apt-get update && apt-get install -q -yy dpkg-dev
+    - dpkg-scanpackages pkg > pkg/Packages
+    - gzip -k pkg/Packages
+  artifacts:
+    paths:
+      - pkg/*
 
 # fails on stretch for the time being - see issue #57 for updates
 .install: &install
@@ -192,6 +203,7 @@ publish:
   variables: &installvars
     DEBIAN_RELEASE: stretch
     OLD_DEBIAN_RELEASE: jessie
+  when: manual
 
 install:fresh-install:
   <<: *install

CHANGELOG

+2019-04-16 - Fixed Gitlab CI
+2019-04-13 - Initial fork from GitHub

README

@@ -12,7 +12,7 @@ Building The Packages
 
 The minimum packages needed to get the build process working are:
 
-  rake devscripts rdoc graphviz
+  rake devscripts rdoc graphviz ruby-dev
 
 You should be able to build all packages via :
 

email/debian/control

@@ -3,7 +3,7 @@ Section: mail
 Priority: extra
 Maintainer: James Carter <jcarter@bytemark.co.uk>
 Uploaders: Patrick J Cherry <patrick@bytemark.co.uk>, Steve Kemp <steve@bytemark.co.uk>
-Build-Depends: debhelper (>= 7.0.0), txt2man, gem2deb, dh-systemd, symbiosis-common
+Build-Depends: debhelper (>= 7.0.0), txt2man, gem2deb, dh-systemd
 Standards-Version: 3.9.6
 XS-Ruby-Versions: all
 

httpd/debian/control

@@ -3,7 +3,7 @@ Section: web
 Priority: optional
 Maintainer: James Carter <jcarter@bytemark.co.uk>
 Uploaders: Patrick J Cherry <patrick@bytemark.co.uk>, Steve Kemp <steve@bytemark.co.uk>
-Build-Depends: debhelper (>= 7.0.0), apache2-dev, libcap-dev, php7.0-common, txt2man, gem2deb, ruby, symbiosis-common, dh-golang, golang-go (>= 1.5.1)
+Build-Depends: debhelper (>= 7.0.0), apache2-dev, libcap-dev, php7.0-common, txt2man, gem2deb, ruby, dh-golang, golang-go (>= 1.5.1)
 Standards-Version: 3.9.6
 XS-Ruby-Versions: all
 

xmpp/debian/control

@@ -3,7 +3,7 @@ Section: net
 Priority: extra
 Maintainer: James Carter <jcarter@bytemark.co.uk>
 Uploaders: Patrick J Cherry <patrick@bytemark.co.uk>, Steve Kemp <steve@bytemark.co.uk>
-Build-Depends: debhelper (>= 7.0.0), gem2deb, txt2man, symbiosis-common
+Build-Depends: debhelper (>= 7.0.0), gem2deb, txt2man
 Standards-Version: 3.9.6
 XS-Ruby-Versions: all