diff options
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-analytics-pnda.yaml | 33 | ||||
| -rw-r--r-- | jjb/global-defaults.yaml | 2 | ||||
| -rw-r--r-- | jjb/sdc/sdc-onap-ui.yaml | 32 | ||||
| -rw-r--r-- | jjb/usecases/5G-bulkpm.yaml | 14 | ||||
| -rw-r--r-- | packer/templates/helm.json | 3 | ||||
| -rw-r--r-- | packer/templates/memcached.json | 2 | ||||
| -rw-r--r-- | packer/templates/redis.json | 3 |
7 files changed, 52 insertions, 37 deletions
diff --git a/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml b/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml new file mode 100644 index 000000000..58ffa75f5 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml @@ -0,0 +1,33 @@ +--- +- project: + name: dcaegen2-analytics-pnda + # job template iterators + project-name: 'dcaegen2-analytics-pnda' + stream: + - 'master': + branch: 'master' + # apply to all jobs + project: 'dcaegen2/analytics/pnda' + mvn-settings: 'dcaegen2-analytics-pnda-settings' + files: '**' + maven-deploy-properties: | + deployAtEnd=true + archive-artifacts: '' + build-node: ubuntu1604-builder-4c-4g + jobs: + - gerrit-maven-clm + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + +- project: + name: dcaegen2-analytics-pnda-sonar + jobs: + - gerrit-maven-sonar + cron: 'H 11 * * *' + build-node: ubuntu1604-builder-4c-4g + project: 'dcaegen2/analytics/pnda' + project-name: 'dcaegen2-analytics-pnda' + branch: 'master' + mvn-settings: 'dcaegen2-analytics-pnda-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml index 450355ff2..9fff285a4 100644 --- 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/sdc/sdc-onap-ui.yaml b/jjb/sdc/sdc-onap-ui.yaml deleted file mode 100644 index 2b09a246b..000000000 --- a/jjb/sdc/sdc-onap-ui.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- - -- project: - name: sdc-onap-ui - project-name: 'sdc-onap-ui' - jobs: - - gerrit-maven-clm - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - project: 'sdc/onap-ui' - stream: - - 'master': - branch: 'master' - mvn-settings: 'sdc-onap-ui-settings' - files: '**' - archive-artifacts: '' - build-timeout: 60 - maven-version: 'mvn35' - -- project: - name: sdc-onap-ui-sonar - jobs: - - gerrit-maven-sonar - cron: 'H 11 * * *' - build-node: ubuntu1604-builder-4c-4g - project: 'sdc/onap-ui' - project-name: 'sdc-onap-ui' - branch: 'master' - mvn-settings: 'sdc-onap-ui-settings' - mvn-params: '-Dsonar.branch={branch}' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m' diff --git a/jjb/usecases/5G-bulkpm.yaml b/jjb/usecases/5G-bulkpm.yaml new file mode 100644 index 000000000..8ef0fdcc0 --- /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 b34ce9f83..51a151cbf 100644 --- 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 ad4bc805a..dd1227ac3 100644 --- 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 20422f677..2b3c03f92 100644 --- 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 @@ } ] } - |