Merge "Merge svnfm docker build Job"

diff --git a/jjb/cli/cli-csit.yaml b/jjb/cli/cli-csit.yaml
new file mode 100644 (file)
index 0000000..798b16c
--- /dev/null
+++ b/jjb/cli/cli-csit.yaml
@@ -0,0 +1,13 @@
+---
+- project:
+    name: cli-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'cli'
+    stream: 'master'
+    functionality:
+      - 'sanity-check':
+          trigger_jobs:
+    robot-options: ''
+    branch: 'master'

diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml
new file mode 100644 (file)
index 0000000..892a99c
--- /dev/null
+++ b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml
@@ -0,0 +1,19 @@
+---
+
+- project:
+    name: modeling-toscaparsers-javatoscachecker
+    project-name: 'modeling-toscaparsers-javatoscachecker'
+    project: 'modeling/toscaparsers'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'modeling-toscaparsers-settings'
+    build-node: ubuntu1604-basebuild-4c-4g
+    subproject:
+      - 'javatoscachecker':
+          pattern: 'javatoscachecker/**'
+          pom: 'javatoscachecker/pom.xml'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java'
+      - '{project-name}-{stream}-{subproject}-release-java-daily'

diff --git a/jjb/msb/msb-csit.yaml b/jjb/msb/msb-csit.yaml
new file mode 100644 (file)
index 0000000..f20d65b
--- /dev/null
+++ b/jjb/msb/msb-csit.yaml
@@ -0,0 +1,17 @@
+---
+- project:
+    name: msb-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'msb'
+    stream: 'master'
+    functionality:
+      - 'sanity-check':
+          trigger_jobs:
+            - 'msb-discovery-master-docker-java-version-shell-daily'
+      - 'tcp-service':
+          trigger_jobs:
+            - 'msb-discovery-master-docker-java-version-shell-daily'
+    robot-options: ''
+    branch: 'master'

diff --git a/jjb/multicloud/build-multicloud-framework-docker-image.sh b/jjb/multicloud/build-multicloud-framework-docker-image.sh
new file mode 100644 (file)
index 0000000..b749b30
--- /dev/null
+++ b/jjb/multicloud/build-multicloud-framework-docker-image.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 ./multivimbroker/docker/*.*
+
+./multivimbroker/docker/build_image.sh
\ No newline at end of file

diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index 4e2f160..6535e84 100644 (file)
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -14,6 +14,11 @@
     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-multicloud-framework-docker-image.sh'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g

diff --git a/jjb/vfc/build-driver-zte-sfc-docker-image.sh b/jjb/vfc/build-driver-zte-sfc-docker-image.sh
index ef5ef98..d570d18 100755 (executable)
--- a/jjb/vfc/build-driver-zte-sfc-docker-image.sh
+++ b/jjb/vfc/build-driver-zte-sfc-docker-image.sh
@@ -5,7 +5,7 @@ echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
 CURRENTDIR="$(pwd)"
 echo $CURRENTDIR
 
-chmod 755 ./zte/sfc-driver/docker/*.*
+chmod 755 ./docker/*.*
 
-./zte/sfc-driver/docker/build_image.sh
+./docker/build_image.sh
 

diff --git a/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml b/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml
new file mode 100644 (file)
index 0000000..f433b06
--- /dev/null
+++ b/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: vfc-nfvo-driver-sfc-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'vfc-nfvo-driver-sfc'
+    stream: 'master'
+    functionality:
+      - 'sanity-check':
+          trigger_jobs:
+            - 'vfc-nfvo-driver-sfc-master-docker-java-version-shell-daily'
+    robot-options: ''
+    branch: 'master'
\ No newline at end of file