Merge "Temporarily disable search-data-service tests"

diff --git a/jjb/aai/aai-csit.yaml b/jjb/aai/aai-csit.yaml
index 7dc8a4f..44e5739 100644 (file)
--- a/jjb/aai/aai-csit.yaml
+++ b/jjb/aai/aai-csit.yaml
@@ -10,5 +10,8 @@
       - 'resources':
           trigger_jobs:
             - 'aai-resources-{stream}-aai-docker-java-version-daily'
+      - 'traversal':
+          trigger_jobs:
+            - 'aai-traversal-{stream}-aai-docker-java-version-daily'
     robot-options: ''
     branch: 'master'

diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index aab9db3..21f7759 100644 (file)
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -6,7 +6,7 @@
       - '{project-name}-{stream}-clm'
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
       - '{project-name}-{stream}-docker-java-daily'
       - '{project-name}-{stream}-docker-version-java-daily'
 

diff --git a/jjb/ccsdk/platform-blueprints.yaml b/jjb/ccsdk/platform-blueprints.yaml
deleted file mode 100644 (file)
index 57364a3..0000000
--- a/jjb/ccsdk/platform-blueprints.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-- project:
-    name: ccsdk-platform-blueprints
-    project-name: 'ccsdk-platform-blueprints'
-    jobs:
-      - '{project-name}-{stream}-clm'
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-
-    project: 'ccsdk/platform/blueprints'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'ccsdk-platform-blueprints-settings'
-    # due to a strange macro / variable translation problem this needs to be
-    # passed as a string block to properly get the properties correctly defined
-    # in the job
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''

diff --git a/jjb/ccsdk/storage-esaas.yaml b/jjb/ccsdk/storage-esaas.yaml
deleted file mode 100644 (file)
index 5593e29..0000000
--- a/jjb/ccsdk/storage-esaas.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-- project:
-    name: ccsdk-storage-esaas
-    project-name: 'ccsdk-storage-esaas'
-    jobs:
-      - '{project-name}-{stream}-clm'
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-
-    project: 'ccsdk/storage/esaas'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'ccsdk-storage-esaas-settings'
-    # due to a strange macro / variable translation problem this needs to be
-    # passed as a string block to properly get the properties correctly defined
-    # in the job
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''

diff --git a/jjb/dcaegen2/dcaegen2-csit.yaml b/jjb/dcaegen2/dcaegen2-csit.yaml
index 62f53b8..f4e5d00 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-csit.yaml
@@ -8,6 +8,7 @@
     functionality:
       - 'testsuites':
           trigger_jobs:
-            - 'dcaegen2-master-release-version-java-daily-no-sonar'
+            - 'dcaegen2-master-merge-java'
+            - 'dcaegen2-collectors-ves-master-merge-java'
     robot-options: ''
     branch: 'master'

diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 0caab51..0ee8893 100644 (file)
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -7,7 +7,7 @@
       - '{project-name}-{stream}-clm'
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
       - '{project-name}-{stream}-docker-java-daily':
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'

diff --git a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh
index 89860d9..db1b504 100755 (executable)
--- a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh
+++ b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh
@@ -10,3 +10,6 @@ chmod 755 ./zte/vmanager/docker/*.*
 
 chmod 755 ./huawei/vnfmadapter/VnfmadapterService/docker/*.*
 ./huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh
+
+chmod 755 ./nokia/vnfmdriver/vfcadaptorservice/docker/*.*
+./nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh
\ No newline at end of file