Merge "Update vfc-sfc-driver yaml templete"

diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
index 92f8482..cf9bf18 100644 (file)
--- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml
+++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
@@ -18,6 +18,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/vnfsdk/vnfsdk-refrepo-csit.yaml b/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml
new file mode 100644 (file)
index 0000000..56634b5
--- /dev/null
+++ b/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: vnfsdk-refrepo-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'vnfsdk-refrepo'
+    stream: 'master'
+    functionality:
+      - 'sanity-check':
+          trigger_jobs:
+           - '{project-name}-{stream}-merge-java'
+    robot-options: ''
+    branch: 'master'

diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
index df9bb76..28e25c6 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -10,13 +10,10 @@
       - '{project-name}-{stream}-stage-site-java':
           site-pom: 'pom.xml'
           trigger-job: '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-version-java-daily':
-         docker-pom: 'pom.xml'
-         mvn-profile: 'docker'
-         maven-properties: |
-          skip.docker.build=false
-          skip.docker.tag=false
-          skip.docker.push=false
+      - '{project-name}-{stream}-aai-docker-java-daily':
+          pom: 'deployment/docker/pom.xml'
+          mvn-goals: 'docker:build'
+          docker-image-name: 'onap/refrepo'
 
     project: 'vnfsdk/refrepo'
     stream: