Merge branch 'issue/230' into 'master'

SCRUM#230: add job on .gitlab-ci.yml to deploy package to stable repository.

See merge request !4

.build.sh

+#!/bin/bash
+
+# This script generates a .deb package
+
+apt-get update && apt-get install -y devscripts
+
+CHANGELOG="package/debian/changelog"
+LINE=$(head -n 1 $CHANGELOG)
+PACKAGE=$(echo $LINE | cut -d' ' -f1)
+VERSION=$(echo $LINE | cut -d' ' -f2 | grep -o -E '[0-9]*\.[0-9]*\.[0-9]*')
+tar --exclude=debian -czf ${PACKAGE}_${VERSION}.orig.tar.gz package/*
+
+cd package
+debuild -us -uc
+cd ../
+
+mkdir build/
+mv ${PACKAGE}* build/

.deploy.sh

+#!/bin/bash
+
+# This script uploads an includes a .deb package in our debian repository.
+# The distribution is chosen based on the gitlab-ci stage we are on.
+
+apt-get update && apt-get install -y dput ssh
+
+eval $(ssh-agent -s)
+ssh-add <(echo "$PRIV_KEY")
+
+echo "Deploy job name: $CI_JOB_NAME"
+
+if [ "$CI_JOB_NAME" = "deploy_for_testing" ]; then
+    dput -u -f --config=dput.cf repo build/*.changes
+elif [ "$CI_JOB_NAME" = "deploy_for_stable" ]; then
+    CHANGELOG="package/debian/changelog"
+    LINE=$(head -n 1 $CHANGELOG)
+    PACKAGE=$(echo $LINE | cut -d' ' -f1)
+    VERSION=$(echo $LINE | cut -d' ' -f2 | grep -o -E '[0-9]*\.[0-9]*\.[0-9]*')
+
+    REPREPRO_CMD="reprepro -Vb /home/repository/www/le6 copysrc stable testing $PACKAGE $VERSION"
+    ssh -o StrictHostKeyChecking=no -i ~/.ssh/id_rsa repository@repo.c3sl.ufpr.br "$REPREPRO_CMD"
+fi  

.gitlab-ci.yml

@@ -12,17 +12,7 @@ build:
   tags:
     - debian-packaging
   script:
-    - apt-get update && apt-get install -y devscripts
-    - LINE=$(head -n 1 package/debian/changelog)
-    - PACKAGE=$(echo $LINE | cut -d' ' -f1)
-    - VERSION=$(echo $LINE | cut -d' ' -f2 | grep -o -E '[0-9]*\.[0-9]*\.[0-9]*')
-    - tar --exclude=debian -czf ${PACKAGE}_${VERSION}.orig.tar.gz package/*
-    - cd package
-    - debuild -us -uc
-    - cd ../
-    - mkdir build/
-    - mv ${PACKAGE}* build/
-    - echo "Estágio de Build finalizado."
+    - ./.build.sh
 
 test:
   stage: test
@@ -30,26 +20,32 @@ test:
     - ubuntu
     - regular
   script:
-    - apt-get update
-    - DEBIAN_FRONTEND=noninteractive apt-get install -y $(pwd)/build/*.deb
+    - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install $(pwd)/build/*.deb
     - recommends=$(grep Recommends package/debian/control | cut -d ':' -f2 | tr -d ',')
     - DEBIAN_FRONTEND=noninteractive apt-get install -y $recommends
 
   dependencies:
     - build
 
-deploy:
+deploy_for_testing:
   stage: deploy
   only:
-    - master
+      - master 
   tags:
     - debian-packaging
   script:
-    - echo "Estágio de Deploy"
-    - apt-get update && apt-get install -y dput ssh
-    - eval $(ssh-agent -s)
-    - ssh-add <(echo "$PRIV_KEY")
-    - dput -u -f --config=dput.cf repo build/*.changes
-    - echo "Estágio de Deploy finalizado"
+    - ./.deploy.sh
+  dependencies:
+    - build
+
+deploy_for_stable:
+  stage: deploy
+  when: manual
+  only:
+      - master
+  tags:
+    - debian-packaging
+  script:
+    - ./.deploy.sh
   dependencies:
     - build

dput.cf

 [repo]
 fqdn = repo.c3sl.ufpr.br
 method = scp
+login = repository
 incoming = /home/repository/www/le6/incoming
 allow_unsigned_uploads = 1
 ssh_config_options = User=repository