Merge "Enabled JaCoCo for SDC workflow designer"

diff --git a/jjb/appc/appc-cdt.yaml b/jjb/appc/appc-cdt.yaml
index 07b6473..be7e1f7 100644 (file)
--- a/jjb/appc/appc-cdt.yaml
+++ b/jjb/appc/appc-cdt.yaml
@@ -12,8 +12,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'appc-cdt-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index 81dc8f4..040913b 100644 (file)
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -14,8 +14,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'appc-deployment-settings'
     files: '**'
     archive-artifacts: ''
@@ -33,8 +31,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'appc-deployment-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index b326228..2384fc9 100644 (file)
--- a/jjb/appc/appc-master.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -18,8 +18,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'appc-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index 450355f..9fff285 100644 (file)
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -15,7 +15,7 @@
     lftools-version: <1.0.0
 
     # packer_version
-    packer-version: 1.1.3
+    packer-version: 1.3.1
 
     # default gerrit server definition
     server-name: 'Primary'

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 781e376..23eaae6 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -41,7 +41,7 @@
 - builder:
     name: integration-run-test
     builders:
-      - shell: "${WORKSPACE}/test/csit/run-csit.sh ${TESTPLAN} ${TESTOPTIONS}"
+      - shell: "${WORKSPACE}/run-csit.sh ${TESTPLAN} ${TESTOPTIONS}"
 
 - builder:
     name: integration-autorelease-fix-relativepaths

diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index 1cd96b4..df94683 100644 (file)
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -9,12 +9,12 @@
 
     properties:
       - lf-infra-properties:
-          project: 'integration'
+          project: 'integration/csit'
           build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
       - infra-parameters:
-          project: 'integration'
+          project: 'integration/csit'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
@@ -37,9 +37,9 @@
     triggers:
       - gerrit-trigger-patch-submitted:
           server: '{server-name}'
-          project: 'integration'
+          project: 'integration/csit'
           branch: '{branch}'
-          files: 'test/csit/**/{project-name}/**'
+          files: '**/{project-name}/**'
 
     builders:
       - integration-install-robotframework
@@ -63,12 +63,12 @@
 
     properties:
       - lf-infra-properties:
-          project: 'integration'
+          project: 'integration/csit'
           build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
       - infra-parameters:
-          project: 'integration'
+          project: 'integration/csit'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
@@ -95,9 +95,9 @@
     triggers:
       - gerrit-trigger-patch-submitted:
           server: '{server-name}'
-          project: 'integration'
+          project: 'integration/csit'
           branch: '{branch}'
-          files: 'test/csit/**/{project-name}/**'
+          files: '**/{project-name}/**'
 
     builders:
       - integration-install-robotframework
@@ -139,12 +139,12 @@
 
     properties:
       - lf-infra-properties:
-          project: 'integration'
+          project: 'integration/csit'
           build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
       - infra-parameters:
-          project: 'integration'
+          project: 'integration/csit'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
@@ -167,9 +167,9 @@
     triggers:
       - gerrit-trigger-patch-merged:
           server: '{server-name}'
-          project: 'integration'
+          project: 'integration/csit'
           branch: '{branch}'
-          files: 'test/csit/**/{project-name}/**'
+          files: '**/{project-name}/**'
       - timed: '@daily'
       - reverse:
           jobs: '{obj:trigger_jobs}'
@@ -196,12 +196,12 @@
 
     properties:
       - lf-infra-properties:
-          project: 'integration'
+          project: 'integration/csit'
           build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
       - infra-parameters:
-          project: 'integration'
+          project: 'integration/csit'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
@@ -228,9 +228,9 @@
     triggers:
       - gerrit-trigger-patch-merged:
           server: '{server-name}'
-          project: 'integration'
+          project: 'integration/csit'
           branch: '{branch}'
-          files: 'test/csit/**/{project-name}/**'
+          files: '**/{project-name}/**'
       - timed: '@daily'
       - reverse:
           jobs: '{obj:trigger_jobs}'

diff --git a/jjb/optf/optf-osdf-csit.yaml b/jjb/optf/optf-osdf-csit.yaml
new file mode 100644 (file)
index 0000000..eada89d
--- /dev/null
+++ b/jjb/optf/optf-osdf-csit.yaml
@@ -0,0 +1,17 @@
+---
+- project:
+     name: optf-osdf-csit
+     jobs:
+       - '{project-name}-{stream}-verify-csit-{functionality}'
+       - '{project-name}-{stream}-csit-{functionality}'
+     project-name: 'optf-osdf'
+     stream:
+       - 'master':
+           branch: master
+       - 'beijing':
+           branch: beijing
+     functionality:
+       - 'osdf':
+           trigger_jobs: 'optf-osdf-master-osdf-docker-java-version-shell-daily'
+     robot-options: ''
+     branch: 'master'

diff --git a/jjb/usecases/5G-bulkpm.yaml b/jjb/usecases/5G-bulkpm.yaml
new file mode 100644 (file)
index 0000000..8ef0fdc
--- /dev/null
+++ b/jjb/usecases/5G-bulkpm.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: usecases-5G-bulkpm-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'usecases'
+    stream: 'master'
+    functionality:
+      - '5G-bulkpm':
+          trigger_jobs:
+            - '{project-name}-{stream}-docker-java-shell-daily'
+    robot-options: ''
+    branch: 'master'

diff --git a/packer/templates/helm.json b/packer/templates/helm.json
index b34ce9f..51a151c 100644 (file)
--- a/packer/templates/helm.json
+++ b/packer/templates/helm.json
@@ -15,7 +15,8 @@
   "builders": [
     {
       "name": "vexxhost",
-      "image_name": "ZZCI - {{user `distro`}} - helm - {{isotime \"20060102-1504\"}}",
+      "image_name": "ZZCI - {{user `distro`}} - helm - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
+      "instance_name": "{{user `distro`}}-builder-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
       "identity_endpoint": "{{user `cloud_auth_url`}}",

diff --git a/packer/templates/memcached.json b/packer/templates/memcached.json
index ad4bc80..dd1227a 100644 (file)
--- a/packer/templates/memcached.json
+++ b/packer/templates/memcached.json
@@ -15,7 +15,7 @@
   "builders": [
     {
       "name": "vexxhost",
-      "image_name": "{{user `distro`}} - memcached - {{isotime \"20171102-0135\"}}",
+      "image_name": "{{user `distro`}} - memcached - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
       "identity_endpoint": "{{user `cloud_auth_url`}}",

diff --git a/packer/templates/redis.json b/packer/templates/redis.json
index 20422f6..2b3c03f 100644 (file)
--- a/packer/templates/redis.json
+++ b/packer/templates/redis.json
@@ -15,7 +15,7 @@
   "builders": [
     {
       "name": "vexxhost",
-      "image_name": "{{user `distro`}} - redis - {{isotime \"20060102-1504\"}}",
+      "image_name": "{{user `distro`}} - redis - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
       "identity_endpoint": "{{user `cloud_auth_url`}}",
@@ -62,4 +62,3 @@
     }
   ]
 }
-