From dd93363c3f503d6d4649afe88325faea3fd2f8c0 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Mon, 24 Apr 2017 10:15:33 +0200 Subject: [PATCH] Updated Dockerfile and Jenkinsfile to push to openvim FTP folder Change-Id: Ic08a1a3d88f3d8e4149b96817f7ae17104b138c6 Signed-off-by: garciadeblas --- Dockerfile | 9 +++++---- Jenkinsfile | 12 +++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 342e32e..94e72b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,9 @@ FROM ubuntu:16.04 -RUN add-apt-repository -y 'deb https://osm-download.etsi.org/repository/osm/debian ReleaseONE unstable' && \ - apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get -y install python python-pip libmysqlclient-dev libssl-dev libffi-dev libvirt-dev && \ +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 libvirt-dev && \ DEBIAN_FRONTEND=noninteractive pip install --upgrade pip && \ - DEBIAN_FRONTEND=noninteractive apt-get -y install python-argcomplete python-jsonschema python-mysqldb python-paramiko python-requests python-yaml python-bottle python-libvirt + DEBIAN_FRONTEND=noninteractive pip install --upgrade setuptools && \ + DEBIAN_FRONTEND=noninteractive apt-get -y install python-argcomplete python-jsonschema python-logutils python-mysqldb python-paramiko python-requests python-yaml python-bottle python-libvirt diff --git a/Jenkinsfile b/Jenkinsfile index b37ccf5..fb40e19 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,7 @@ pipeline { - agent any + agent { + label "pipeline" + } stages { stage("Build") { agent { @@ -23,10 +25,10 @@ pipeline { unstash "deb-files" sh ''' mkdir -p pool/openvim - mv ./build/*.deb pool/openvim/ - mkdir -p dists/$RELEASE/openvim/binary-amd64/ - apt-ftparchive packages pool/openvim > dists/$RELEASE/openvim/binary-amd64/Packages - gzip -9fk dists/$RELEASE/openvim/binary-amd64/Packages + mv .build/*.deb pool/openvim/ + mkdir -p dists/$RELEASE/unstable/openvim/binary-amd64/ + apt-ftparchive packages pool/openvim > dists/$RELEASE/unstable/openvim/binary-amd64/Packages + gzip -9fk dists/$RELEASE/unstable/openvim/binary-amd64/Packages ''' archiveArtifacts artifacts: "dists/**,pool/openvim/*.deb" } -- 2.25.1