Merge "Add the casablanca for certain aai jobs"

diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index d9125de..37cdb1f 100644 (file)
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -36,6 +36,7 @@
     name: aai-aai-common-clm
     jobs:
       - gerrit-maven-clm
+    build-node: ubuntu1604-builder-4c-4g
     project: 'aai/aai-common'
     project-name: 'aai-aai-common'
     branch: 'casablanca'

diff --git a/jjb/appc/appc-csit.yaml b/jjb/appc/appc-csit.yaml
index 7e4e9cd..3fe0049 100644 (file)
--- a/jjb/appc/appc-csit.yaml
+++ b/jjb/appc/appc-csit.yaml
@@ -8,6 +8,8 @@
     stream:
       - 'master':
           branch: master
+      - 'casablanca':
+          branch: 'casablanca'
     functionality:
       - 'healthcheck':
           trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'

diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml
index 4683292..c3d19f5 100644 (file)
--- a/jjb/demo/demo.yaml
+++ b/jjb/demo/demo.yaml
@@ -4,7 +4,6 @@
     name: demo
     project-name: 'demo'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'

diff --git a/jjb/portal-sdk/portal-sdk-csit.yaml b/jjb/portal-sdk/portal-sdk-csit.yaml
deleted file mode 100644 (file)
index c5667e6..0000000
--- a/jjb/portal-sdk/portal-sdk-csit.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-- project:
-    name: portal-sdk-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'portal-sdk'
-    stream: 'master'
-    functionality:
-      - 'testsuite':
-          trigger_jobs: 'portal-docker-{stream}-merge-docker-script'
-    robot-options: ''
-    branch: 'master'

diff --git a/jjb/portal/portal-csit.yaml b/jjb/portal/portal-csit.yaml
deleted file mode 100644 (file)
index 697db46..0000000
--- a/jjb/portal/portal-csit.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-- project:
-    name: portal-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'portal'
-    stream: 'master'
-    functionality:
-      - 'testsuite':
-          trigger_jobs: 'portal-docker-{stream}-merge-docker-script'
-    robot-options: ''
-    branch: 'master'