Merge "Refactor ssh commands" into v2.0
diff --git a/Jenkinsfile b/Jenkinsfile
index 8faa181..6c9468f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,38 +1,30 @@
-pipeline {
- agent {
- label "pipeline"
- }
- 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/openvim
- mv .build/*.deb pool/openvim/
- mkdir -p dists/ReleaseOne/unstable/openvim/binary-amd64/
- apt-ftparchive packages pool/openvim > dists/ReleaseOne/unstable/openvim/binary-amd64/Packages
- gzip -9fk dists/ReleaseOne/unstable/openvim/binary-amd64/Packages
- '''
- archiveArtifacts artifacts: "dists/**,pool/openvim/*.deb"
- }
- }
- }
+properties([
+ parameters([
+ string(defaultValue: env.BRANCH_NAME, description: '', name: 'GERRIT_BRANCH'),
+ string(defaultValue: 'osm/openvim', 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( 'openvim',
+ 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 0000000..71c93fd
--- /dev/null
+++ b/devops-stages/stage-archive.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+rm -rf pool
+rm -rf dists
+mkdir -p pool/openvim
+mv .build/*.deb pool/openvim/
+mkdir -p dists/unstable/openvim/binary-amd64/
+apt-ftparchive packages pool/openvim > dists/unstable/openvim/binary-amd64/Packages
+gzip -9fk dists/unstable/openvim/binary-amd64/Packages
diff --git a/devops-stages/stage-build.sh b/devops-stages/stage-build.sh
new file mode 100755
index 0000000..8505499
--- /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 0000000..49296c7
--- /dev/null
+++ b/devops-stages/stage-test.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+echo "UNITTEST"