From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Wed, 12 Jul 2017 08:54:08 +0000 (+0200)
Subject: Merge "new test for openmano client" into v2.0
X-Git-Tag: v2.0.2~3
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=84e8396919ee9ead80489ba9eb7419f7df029d55;hp=574b09fa48031e0f071a1e27c47b2267a6267573;p=osm%2FRO.git

Merge "new test for openmano client" into v2.0
---

diff --git a/Dockerfile b/Dockerfile
index 82c3ca98..254027cf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:16.04
 
 RUN  apt-get update && \
-  DEBIAN_FRONTEND=noninteractive apt-get -y install git build-essential && \
+  DEBIAN_FRONTEND=noninteractive apt-get -y install git build-essential apt-utils && \
   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 && \
diff --git a/Jenkinsfile b/Jenkinsfile
index 13a85d03..bc6c2d0f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,36 +1,30 @@
-pipeline {
-	agent any
-	stages {
-		stage("Build") {
-			agent {
-				dockerfile true
-			}
-			steps {
-				sh 'make package'
-				stash name: "deb-files", includes: ".build/*.deb"
-			}
-		}
-		stage("Unittest") {
-			agent {
-				dockerfile true
-			}
-			steps {
-				sh 'echo "UNITTEST"'
-			}
-		}
-		stage("Repo Component") {
-			agent any
-			steps {
-				unstash "deb-files"
-				sh '''
-					mkdir -p pool/RO
-					mv .build/*.deb pool/RO/
-					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"
-			}
-		}
-	}
+properties([
+    parameters([
+        string(defaultValue: env.BRANCH_NAME, description: '', name: 'GERRIT_BRANCH'),
+        string(defaultValue: 'osm/RO', description: '', name: 'GERRIT_PROJECT'),
+        string(defaultValue: env.GERRIT_REFSPEC, description: '', name: 'GERRIT_REFSPEC'),
+        string(defaultValue: env.GERRIT_PATCHSET_REVISION, description: '', name: 'GERRIT_PATCHSET_REVISION'),
+        string(defaultValue: 'https://osm.etsi.org/gerrit', description: '', name: 'PROJECT_URL_PREFIX'),
+        booleanParam(defaultValue: false, description: '', name: 'TEST_INSTALL'),
+    ])
+])
+
+def devops_checkout() {
+    dir('devops') {
+        git url: "${PROJECT_URL_PREFIX}/osm/devops", branch: params.GERRIT_BRANCH
+    }
+}
+
+node {
+    checkout scm
+    devops_checkout()
+
+    ci_helper = load "devops/jenkins/ci-pipelines/ci_stage_2.groovy"
+    ci_helper.ci_pipeline( 'RO',
+                           params.PROJECT_URL_PREFIX,
+                           params.GERRIT_PROJECT,
+                           params.GERRIT_BRANCH,
+                           params.GERRIT_REFSPEC,
+                           params.GERRIT_PATCHSET_REVISION,
+                           params.TEST_INSTALL)
 }
diff --git a/devops-stages/stage-archive.sh b/devops-stages/stage-archive.sh
new file mode 100755
index 00000000..cc1cfc05
--- /dev/null
+++ b/devops-stages/stage-archive.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+rm -rf pool
+rm -rf dists
+mkdir -p pool/RO
+mv .build/*.deb pool/RO/
+mkdir -p dists/unstable/RO/binary-amd64/
+apt-ftparchive packages pool/RO > dists/unstable/RO/binary-amd64/Packages
+gzip -9fk dists/unstable/RO/binary-amd64/Packages
diff --git a/devops-stages/stage-build.sh b/devops-stages/stage-build.sh
new file mode 100755
index 00000000..85054995
--- /dev/null
+++ b/devops-stages/stage-build.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+make package
diff --git a/devops-stages/stage-test.sh b/devops-stages/stage-test.sh
new file mode 100755
index 00000000..49296c71
--- /dev/null
+++ b/devops-stages/stage-test.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+echo "UNITTEST"