Merge "Add CCSDK elalto jobs"

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 84d9cd0..1e16acd 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -613,6 +613,12 @@
 
     builders:
       - lf-infra-pre-build
+      - conditional-step:
+          condition-kind: regex-match
+          regex: .*(amd64|arm64).*
+          label: '{project-name}'
+          steps:
+            - shell: !include-raw-escape: global-jjb/shell/docker-login.sh
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'

diff --git a/jjb/modeling/modeling-etsicatalog-csit.yaml b/jjb/modeling/modeling-etsicatalog-csit.yaml
new file mode 100644 (file)
index 0000000..76ebd4f
--- /dev/null
+++ b/jjb/modeling/modeling-etsicatalog-csit.yaml
@@ -0,0 +1,13 @@
+---
+- project:
+    name: modeling-etsicatalog-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'modeling-etsicatalog'
+    stream: 'master'
+    functionality:
+      - 'sanity-check':
+          trigger_jobs: 'modeling-etsicatalog-master-docker-java-version-shell-daily'
+    robot-options: ''
+    branch: 'master'
\ No newline at end of file

diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
index bf813c5..1f86f85 100644 (file)
--- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
@@ -75,6 +75,7 @@
     nexus-iq-namespace: 'onap-'
     project: multicloud/openstack/vmware
     project-name: 'multicloud-openstack-vmware'
+    build-node: 'ubuntu1604-builder-4c-4g'
     branch: 'master'
     mvn-settings: 'multicloud-openstack-vmware-settings'