Merge "Fix issue about framework release job"

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu16.04-docker-arm64-4c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu16.04-docker-arm64-4c-2g.cfg
index c328e94..f47c417 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu16.04-docker-arm64-4c-2g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu16.04-docker-arm64-4c-2g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - arm64 - 20181031-164620.606
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - arm64 - 20190410-005349.357
 LABELS=ubuntu1604-docker-arm64-4c-2g
 HARDWARE_ID=lf-standard-2

diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
new file mode 100644 (file)
index 0000000..ff7382f
--- /dev/null
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -0,0 +1,56 @@
+---
+- project:
+    name: policy-docker-base-common
+    project-name: 'policy-docker'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java':
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: "-Dmaven.test.skip=true"
+          build-node: ubuntu1604-docker-8c-8g
+      - '{project-name}-{stream}-docker-version-java-daily':
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: '-Dmaven.test.skip=true'
+          disabled: true
+          build-node: ubuntu1604-docker-8c-8g
+    project: 'policy/docker'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'policy-docker-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: policy-docker-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: '@daily'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'policy/docker'
+    project-name: 'policy-docker'
+    branch: 'master'
+    mvn-settings: 'policy-docker-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: policy-docker-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: policy/docker
+    project-name: 'policy-docker'
+    branch: 'master'
+    mvn-settings: 'policy-docker-settings'
+
+- project:
+    name: policy-docker-info
+    project-name: policy-docker
+    jobs:
+      - gerrit-info-yaml-verify
+    project: policy/docker
+    branch: master

diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml
index 2f103de..9736280 100644 (file)
--- a/jjb/vid/vid.yaml
+++ b/jjb/vid/vid.yaml
@@ -70,6 +70,7 @@
     mvn-settings: 'vid-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-params: '-Dskip.npm'
 
 - project:
     name: vid-clm
@@ -81,6 +82,7 @@
     build-node: ubuntu1604-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vid-settings'
+    mvn-params: '-Dskip.npm'
 
 - project:
     name: vid-info