Merge "Update to common-packer v0.3.1, packer 1.4.2"

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-8g.cfg
new file mode 100644 (file)
index 0000000..31c020b
--- /dev/null
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-8g.cfg
@@ -0,0 +1,2 @@
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190315-024623.770
+HARDWARE_ID=v2-standard-2

diff --git a/jjb/akraino-templates/akraino-jjb-kni.yaml b/jjb/akraino-templates/akraino-jjb-kni.yaml
index e207263..16f0db5 100644 (file)
--- a/jjb/akraino-templates/akraino-jjb-kni.yaml
+++ b/jjb/akraino-templates/akraino-jjb-kni.yaml
@@ -133,9 +133,9 @@
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
+      - compare-type: ANT
         pattern: 'Makefile'
-      - compare-type: REG_EXP
+      - compare-type: ANT
         pattern: 'cmd/binary.go'
 
     gerrit_verify_triggers:
@@ -228,10 +228,12 @@
               key-file-variable: KNI_KEY_PATH
 
     gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'profiles/production.aws/*'
-      - compare-type: REG_EXP
-        pattern: 'sites/testing.aws.edge-sites.net/*'
+      - compare-type: ANT
+        pattern: 'profiles/production.aws/**'
+      - compare-type: ANT
+        pattern: 'sites/testing.aws.edge-sites.net/**'
+      - compare-type: ANT
+        pattern: 'base/**'
 
     gerrit_verify_triggers:
       - patchset-created-event:
@@ -327,10 +329,12 @@
               key-file-variable: KNI_KEY_PATH
 
     gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'profiles/testing.libvirt/*'
-      - compare-type: REG_EXP
-        pattern: 'sites/testing.virt.edge-sites.net/*'
+      - compare-type: ANT
+        pattern: 'profiles/testing.libvirt/**'
+      - compare-type: ANT
+        pattern: 'sites/testing.virt.edge-sites.net/**'
+      - compare-type: ANT
+        pattern: 'base/**'
 
     gerrit_verify_triggers:
       - patchset-created-event:

diff --git a/jjb/iec/iec.yaml b/jjb/iec/iec.yaml
index 6b3ac09..ad662cb 100644 (file)
--- a/jjb/iec/iec.yaml
+++ b/jjb/iec/iec.yaml
@@ -4,7 +4,9 @@
     project-name: 'iec'
     project: '{project-name}'
     views:
-      - project-view
+      - common-view:
+          view-name: iec
+          view-regex: '^{project-name}-(tox|fuel|compass)-.*'
     # -------------------------------
     # BRANCH DEFINITIONS
     # -------------------------------

diff --git a/jjb/ta/caas-danm.yaml b/jjb/ta/caas-danm.yaml
index 9a0e532..4011935 100644 (file)
--- a/jjb/ta/caas-danm.yaml
+++ b/jjb/ta/caas-danm.yaml
@@ -5,7 +5,7 @@
     project-type:
         - merge
         - verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos7-builder-2c-8g
     stream: master
     jobs:
       - akraino-project-stream-type-ta

diff --git a/jjb/ta/caas-metrics.yaml b/jjb/ta/caas-metrics.yaml
index 5741fd3..7921ea2 100644 (file)
--- a/jjb/ta/caas-metrics.yaml
+++ b/jjb/ta/caas-metrics.yaml
@@ -5,7 +5,7 @@
     project-type:
         - merge
         - verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos7-builder-2c-8g
     stream: master
     jobs:
       - akraino-project-stream-type-ta