Merge "Initial Docker baselines for SDC"
diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml
new file mode 100644
index 0000000..1658b87
--- /dev/null
+++ b/jjb/oom/oom-registrator.yaml
@@ -0,0 +1,17 @@
+---
+- project:
+ name: oom-registrator
+ project-name: 'oom-registrator'
+ jobs:
+ - '{project-name}-{stream}-clm'
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily'
+ project: 'oom/registrator'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'oom-registrator-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/vfc/build-driver-svnfm-zte-docker-image.sh b/jjb/vfc/build-driver-svnfm-zte-docker-image.sh
new file mode 100755
index 0000000..fbc6756
--- /dev/null
+++ b/jjb/vfc/build-driver-svnfm-zte-docker-image.sh
@@ -0,0 +1,11 @@
+#!/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-gvnfm-vnflcm-docker-image.sh b/jjb/vfc/build-gvnfm-vnflcm-docker-image.sh
index d570d18..e4c7430 100755
--- a/jjb/vfc/build-gvnfm-vnflcm-docker-image.sh
+++ b/jjb/vfc/build-gvnfm-vnflcm-docker-image.sh
@@ -5,7 +5,7 @@
CURRENTDIR="$(pwd)"
echo $CURRENTDIR
-chmod 755 ./docker/*.*
+chmod 755 ./lcm/docker/*.*
-./docker/build_image.sh
+./lcm/docker/build_image.sh
diff --git a/jjb/vfc/build-gvnfm-vnfmgr-docker-image.sh b/jjb/vfc/build-gvnfm-vnfmgr-docker-image.sh
new file mode 100644
index 0000000..b16fa2d
--- /dev/null
+++ b/jjb/vfc/build-gvnfm-vnfmgr-docker-image.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 ./mgr/docker/*.*
+
+./mgr/docker/build_image.sh
+
diff --git a/jjb/vfc/build-gvnfm-vnfres-docker-image.sh b/jjb/vfc/build-gvnfm-vnfres-docker-image.sh
new file mode 100755
index 0000000..dbfd2ca
--- /dev/null
+++ b/jjb/vfc/build-gvnfm-vnfres-docker-image.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 ./res/docker/*.*
+
+./res/docker/build_image.sh
+
diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
index e751d48..36d7024 100644
--- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
@@ -16,7 +16,7 @@
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-docker-java-version-shell-daily':
- docker-pom: 'lcm/pom.xml'
+ docker-pom: 'pom.xml'
mvn-goals: 'install'
script:
!include-raw-escape: 'build-gvnfm-vnflcm-docker-image.sh'
diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
index 5fec8cc..05c01dd 100644
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-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-gvnfm-vnfmgr-docker-image.sh'
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file
diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
index da8460d..02c9595 100644
--- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
@@ -15,6 +15,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-gvnfm-vnfres-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-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
index 7fa3c25..db40e10 100644
--- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
@@ -14,6 +14,7 @@
jobs:
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
+ - '{project-name}-{stream}-{subproject}-release-java-daily'
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-basebuild-4c-4g
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 23a6117..c295f25 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
@@ -15,6 +15,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-driver-svnfm-zte-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-lcm-csit.yaml b/jjb/vfc/vfc-nfvo-lcm-csit.yaml
new file mode 100644
index 0000000..f5ad311
--- /dev/null
+++ b/jjb/vfc/vfc-nfvo-lcm-csit.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+ name: vfc-nfvo-lcm-csit
+ jobs:
+ - '{project-name}-{stream}-verify-csit-{functionality}'
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: 'vfc-nfvo-lcm'
+ stream: 'master'
+ functionality:
+ - 'sanity-check':
+ trigger_jobs:
+ - 'vfc-nfvo-lcm-master-docker-java-version-shell-daily'
+ robot-options: ''
+ branch: 'master'
\ No newline at end of file
diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml
index 2bf363c..2eea1a6 100644
--- a/jjb/vfc/vfc-nfvo-resmanagement.yaml
+++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml
@@ -14,6 +14,7 @@
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-java-daily'
- '{project-name}-{stream}-docker-version-java-daily':
docker-pom: 'pom.xml'
mvn-profile: 'docker'