Commit 299773fd authored by Lucas Sulzbach's avatar Lucas Sulzbach
Browse files

Merge branch 'develop' into 'issue/556'

# Conflicts:
#   package/debian/changelog
parents f68fe68d a6bf2ffd
Pipeline #16374 passed with stages
in 9 minutes and 52 seconds
......@@ -10,8 +10,16 @@ ssh-add <(echo "$PRIV_KEY")
echo "Deploy job name: $CI_JOB_NAME"
if [ "$CI_JOB_NAME" = "deploy_for_testing" ]; then
if [ "$CI_JOB_NAME" = "deploy_for_unstable" ]; then
dput -u -f --config=dput.cf repo build/*.changes
elif [ "$CI_JOB_NAME" = "deploy_for_testing" ]; 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 testing unstable $PACKAGE $VERSION"
ssh -o StrictHostKeyChecking=no -i ~/.ssh/id_rsa repository@repo.c3sl.ufpr.br "$REPREPRO_CMD"
elif [ "$CI_JOB_NAME" = "deploy_for_stable" ]; then
CHANGELOG="package/debian/changelog"
LINE=$(head -n 1 $CHANGELOG)
......@@ -20,4 +28,4 @@ elif [ "$CI_JOB_NAME" = "deploy_for_stable" ]; then
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
fi
......@@ -26,12 +26,37 @@ test:
- apt-get update && apt-get install -y wget
- echo "deb http://repo.c3sl.ufpr.br/le6/ unstable main" > /etc/apt/sources.list.d/le6.list
- wget -O- http://repo.c3sl.ufpr.br/le6/le.c3sl.ufpr.br.key | apt-key add -
- echo "Installation test:"
- apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install $(pwd)/build/*.deb language-pack-gnome-pt language-pack-pt-base
- echo "Removal test:"
- pkg_name=$(dpkg -I $(pwd)/build/*.deb | grep Package | head -1 | cut -d ':' -f2)
- DEBIAN_FRONTEND=noninteractive apt -y remove $pkg_name
- echo "Getting latest stable package from repo..."
- DEBIAN_FRONTEND=noninteractive apt-get -y install wget
- wget http://repo.c3sl.ufpr.br/le6/dists/stable/main/binary-amd64/Packages
- wget http://repo.c3sl.ufpr.br/le6/$(tail -n +$(grep -n "Package:${pkg_name}" Packages | cut -d ":" -f1) Packages | grep "Filename" | head -1 |cut -d " " -f2)
- echo "Update test:"
- DEBIAN_FRONTEND=noninteractive apt-get -y install $(pwd)/*.deb
- DEBIAN_FRONTEND=noninteractive apt-get -y install $(pwd)/build/*.deb
- echo "Downgrade test:"
- DEBIAN_FRONTEND=noninteractive apt-get -y --allow-downgrades install $(pwd)/*.deb
dependencies:
- build
deploy_for_unstable:
stage: deploy
only:
- develop
tags:
- debian-packaging
script:
- ./.deploy.sh
dependencies:
- build
deploy_for_testing:
stage: deploy
when: manual
only:
- master
tags:
......
......@@ -13,6 +13,13 @@ le-epoptes (0.1.0) unstable; urgency=medium
-- Lucas Sulzbach <lesuporte@c3sl.ufpr.br> Fri, 29 Jun 2018 08:57:10 -0300
le-epoptes (0.0.20) unstable; urgency=medium
* Add more testing stages on CI (Closes: #463)
* Change deploy to unstable (Closes: #492)
-- Guilherme Becker Agge <gba17@inf.ufpr.br> Wed, 20 Jun 2018 10:40:11 -0300
le-epoptes (0.0.20) testing; urgency=medium
* Add error message when epoptes can not connect with le-lab
......
......@@ -152,7 +152,7 @@ class LEEpoptes_control(object):
self.update_server('pre_server',server)
else:
self.update_server('server',socket.gethostname())
self.update_server('server',socket.gethostname()+".local")
return server
......@@ -202,7 +202,7 @@ class LEEpoptes_control(object):
server = self.conn.get_attribute('epoptes', '_server')
if status == 'pre_server':
self.update_server('server',socket.gethostname())
self.update_server('server',socket.gethostname()+".local")
elif status == 'client':
'''
Check if the server that disconnected is the one that this
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment