From 4505c3038d4d4a97633d2bce9bb42c30745624da Mon Sep 17 00:00:00 2001
From: "ying.yunlong" <ying.yunlong@zte.com.cn>
Date: Wed, 6 Sep 2017 13:56:17 +0800
Subject: Merge svnfm docker build Job

Because the job template does not support subproject, ZTE and Huawei's driver
Docker job names are the same, so need to be merged into a job

Change-Id: I363565aeffbfb3a4a51f56cc3c761ab6f2a27802
Issue-ID: CIMAN-59
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
---
 jjb/vfc/build-driver-svnfm-zte-docker-image.sh      | 11 -----------
 jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh     | 12 ++++++++++++
 jjb/vfc/build-svnfm-huawei-docker-image.sh          | 11 -----------
 jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml           |  5 -----
 jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml | 19 +++++++++++++++++++
 jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml    |  5 -----
 6 files changed, 31 insertions(+), 32 deletions(-)
 delete mode 100755 jjb/vfc/build-driver-svnfm-zte-docker-image.sh
 create mode 100755 jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh
 delete mode 100755 jjb/vfc/build-svnfm-huawei-docker-image.sh
 create mode 100644 jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml

(limited to 'jjb/vfc')

diff --git a/jjb/vfc/build-driver-svnfm-zte-docker-image.sh b/jjb/vfc/build-driver-svnfm-zte-docker-image.sh
deleted file mode 100755
index fbc6756a8..000000000
--- a/jjb/vfc/build-driver-svnfm-zte-docker-image.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-#
-echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
-
-CURRENTDIR="$(pwd)"
-echo $CURRENTDIR
-
-chmod 755 ./zte/vmanager/docker/*.*
-
-./zte/vmanager/docker/build_image.sh
-
diff --git a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh
new file mode 100755
index 000000000..417082b98
--- /dev/null
+++ b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 ./zte/vmanager/docker/*.*
+./zte/vmanager/docker/build_image.sh
+
+chmod 755 ./VnfmadapterService/docker/*.*
+./VnfmadapterService/docker/build_image.sh
diff --git a/jjb/vfc/build-svnfm-huawei-docker-image.sh b/jjb/vfc/build-svnfm-huawei-docker-image.sh
deleted file mode 100755
index 964043019..000000000
--- a/jjb/vfc/build-svnfm-huawei-docker-image.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-#
-echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
-
-CURRENTDIR="$(pwd)"
-echo $CURRENTDIR
-
-chmod 755 ./VnfmadapterService/docker/*.*
-
-./VnfmadapterService/docker/build_image.sh
-
diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
index 36632508c..db40e10c8 100644
--- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
@@ -15,11 +15,6 @@
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-{subproject}-release-java-daily'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'huawei/vnfmadapter/pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-svnfm-huawei-docker-image.sh'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml
new file mode 100644
index 000000000..8698735ff
--- /dev/null
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml
@@ -0,0 +1,19 @@
+---
+
+- project:
+    name: vfc-nfvo-driver-vnfm-svnfm-docker
+    project-name: 'vfc-nfvo-driver-vnfm-svnfm'
+    project: 'vfc/nfvo/driver/vnfm/svnfm'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
+    jobs:
+      - '{project-name}-{stream}-docker-java-version-shell-daily':
+          docker-pom: 'pom.xml'
+          mvn-goals: 'install'
+          script:
+            !include-raw-escape: 'build-nfvo-svnfm-driver-docker-image.sh'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
index c295f25fe..23a611774 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
@@ -15,11 +15,6 @@
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-driver-svnfm-zte-docker-image.sh'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file
-- 
cgit 1.2.3-korg