From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Mon, 24 Apr 2017 09:41:29 +0000 (+0200)
Subject: Updated Jenkinsfile to push to unstable folder, updated Dockerfile to include pypi2deb
X-Git-Tag: v2.0.0~12
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FRO.git;a=commitdiff_plain;h=515dbaed7d0a026ef079c3a50747ef6f4b5d6309

Updated Jenkinsfile to push to unstable folder, updated Dockerfile to include pypi2deb

Change-Id: I7d478de20bf92a0e7b24be4e8a69aea3aa8d691a
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---

diff --git a/Dockerfile b/Dockerfile
index 66cb83df..84144a8c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,9 @@
 FROM ubuntu:16.04
 
 RUN  apt-get update && \
-  DEBIAN_FRONTEND=noninteractive apt-get -y install git make && \
-  DEBIAN_FRONTEND=noninteractive apt-get -y install python python-stdeb python-pip libmysqlclient-dev libssl-dev libffi-dev && \
+  DEBIAN_FRONTEND=noninteractive apt-get -y install git build-essential && \
+  DEBIAN_FRONTEND=noninteractive apt-get -y install python python-dev python-all python-stdeb fakeroot pypi2deb && \
+  DEBIAN_FRONTEND=noninteractive apt-get -y install python-pip libmysqlclient-dev libssl-dev libffi-dev && \
   DEBIAN_FRONTEND=noninteractive pip install --upgrade pip && \
   DEBIAN_FRONTEND=noninteractive pip install --upgrade setuptools && \
   DEBIAN_FRONTEND=noninteractive apt-get -y install python-argcomplete python-boto python-bottle python-jsonschema python-logutils python-cinderclient python-glanceclient python-keystoneclient python-neutronclient python-novaclient python-mysqldb
diff --git a/Jenkinsfile b/Jenkinsfile
index 342f5863..671b4c55 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -26,9 +26,9 @@ pipeline {
 				sh '''
 					mkdir -p pool/RO
 					mv .build/*.deb pool/RO/
-					mkdir -p dists/$RELEASE/unstable/RO/binary-amd64/
-					apt-ftparchive packages pool/RO > dists/$RELEASE/unstable/RO/binary-amd64/Packages
-					gzip -9fk dists/$RELEASE/unstable/RO/binary-amd64/Packages
+					mkdir -p dists/ReleaseOne/unstable/RO/binary-amd64/
+					apt-ftparchive packages pool/RO > dists/ReleaseOne/unstable/RO/binary-amd64/Packages
+					gzip -9fk dists/ReleaseOne/unstable/RO/binary-amd64/Packages
 					'''
 				archiveArtifacts artifacts: "dists/**,pool/RO/*.deb"
 			}