Merge "Add Job trigger for Kubernetes Plugin"

diff --git a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
index e3cd68c..648678b 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20180817-215307.947
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20180822-024356.338
 LABELS=queue-docker-4c-4g
 HARDWARE_ID=v2-highcpu-4
 INSTANCE_CAP=1

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
index f852426..18c6314 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20180817-215307.947
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20180822-024356.338
 LABELS=ubuntu1604-docker-8c-8g
 HARDWARE_ID=v2-highcpu-8

diff --git a/jjb/aai/aai-aai-config.yaml b/jjb/aai/aai-aai-config.yaml
deleted file mode 100644 (file)
index 52cf5f3..0000000
--- a/jjb/aai/aai-aai-config.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: aai-aai-config
-    project-name: 'aai-aai-config'
-    jobs:
-      - gerrit-maven-clm
-    project: 'aai/aai-config'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-aai-config-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g

diff --git a/jjb/aai/aai-aai-data.yaml b/jjb/aai/aai-aai-data.yaml
deleted file mode 100644 (file)
index e012c05..0000000
--- a/jjb/aai/aai-aai-data.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: aai-aai-data
-    project-name: 'aai-aai-data'
-    jobs:
-      - gerrit-maven-clm
-    project: 'aai/aai-data'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-aai-data-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g

diff --git a/jjb/aai/aai-eis.yaml b/jjb/aai/aai-eis.yaml
deleted file mode 100644 (file)
index 66f20e5..0000000
--- a/jjb/aai/aai-eis.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: aai-eis
-    project-name: 'aai-eis'
-    jobs:
-      - gerrit-maven-clm
-    project: 'aai/eis'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-eis-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g

diff --git a/jjb/aai/aai-gap.yaml b/jjb/aai/aai-gap.yaml
deleted file mode 100644 (file)
index 4854bd0..0000000
--- a/jjb/aai/aai-gap.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: aai-gap
-    project-name: 'aai-gap'
-    jobs:
-      - gerrit-maven-clm
-    project: 'aai/gap'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-gap-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g

diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml
deleted file mode 100644 (file)
index 5e5ef52..0000000
--- a/jjb/aai/aai-graphgraph.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: aai-graphgraph
-    project-name: 'aai-graphgraph'
-    jobs:
-      - gerrit-maven-clm
-    project: 'aai/graphgraph'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-graphgraph-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g

diff --git a/jjb/aai/aai-tabular-data-service.yaml b/jjb/aai/aai-tabular-data-service.yaml
deleted file mode 100644 (file)
index d673f83..0000000
--- a/jjb/aai/aai-tabular-data-service.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: aai-tabular-data-service
-    project-name: 'aai-tabular-data-service'
-    jobs:
-      - gerrit-maven-clm
-    project: 'aai/tabular-data-service'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-tabular-data-service-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g

diff --git a/jjb/aai/aai-test-config.yaml b/jjb/aai/aai-test-config.yaml
deleted file mode 100644 (file)
index 19cf2b4..0000000
--- a/jjb/aai/aai-test-config.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: aai-test-config
-    project-name: 'aai-test-config'
-    jobs:
-      - gerrit-maven-clm
-    project: 'aai/test-config'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-test-config-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g

diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index 601fd2b..c6929bb 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
@@ -37,4 +37,5 @@
     branch: 'master'
     mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
     mvn-goals: 'clean install'
+    mvn-params: '-DskipDocker'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml
index 4170b81..e452b70 100644 (file)
--- a/packer/provision/local-docker.yaml
+++ b/packer/provision/local-docker.yaml
@@ -146,6 +146,7 @@
       copy:
         src: /tmp/rebar3/rebar3
         dest: /usr/bin/rebar3
+        mode: 0644
         remote_src: true
       become: true