diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/aai/aai-aai-service.yaml | 2 | ||||
| -rw-r--r-- | jjb/aai/aai-csit.yaml | 8 | ||||
| -rw-r--r-- | jjb/aai/aai-esr-server-csit.yaml | 14 | ||||
| -rw-r--r-- | jjb/ccsdk/distribution.yaml | 2 | ||||
| -rw-r--r-- | jjb/ccsdk/platform-blueprints.yaml | 22 | ||||
| -rw-r--r-- | jjb/ccsdk/platform-plugins.yaml | 2 | ||||
| -rw-r--r-- | jjb/ccsdk/storage-esaas.yaml | 22 | ||||
| -rw-r--r-- | jjb/ccsdk/storage-pgaas.yaml | 2 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-csit.yaml | 3 | ||||
| -rw-r--r-- | jjb/sdnc/sdnc-oam.yaml | 2 | ||||
| -rwxr-xr-x | jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh | 3 |
11 files changed, 15 insertions, 67 deletions
diff --git a/jjb/aai/aai-aai-service.yaml b/jjb/aai/aai-aai-service.yaml index 01d5cfda1..4d1eb21ed 100644 --- a/jjb/aai/aai-aai-service.yaml +++ b/jjb/aai/aai-aai-service.yaml @@ -16,8 +16,6 @@ project: 'aai/aai-service' stream: - - 'master': - branch: 'master' - 'release-1.0.0': branch: 'release-1.0.0' mvn-settings: 'aai-aai-service-settings' diff --git a/jjb/aai/aai-csit.yaml b/jjb/aai/aai-csit.yaml index 7841a6773..303aa5f5c 100644 --- a/jjb/aai/aai-csit.yaml +++ b/jjb/aai/aai-csit.yaml @@ -7,10 +7,14 @@ project-name: 'aai' stream: 'master' functionality: - - 'search-data-service': - trigger_jobs: - 'resources': trigger_jobs: - 'aai-resources-{stream}-aai-docker-java-version-daily' + - 'traversal': + trigger_jobs: + - 'aai-traversal-{stream}-aai-docker-java-version-daily' + - 'esr-server': + trigger_jobs: + - 'aai-esr-server-{stream}-docker-java-daily' robot-options: '' branch: 'master' diff --git a/jjb/aai/aai-esr-server-csit.yaml b/jjb/aai/aai-esr-server-csit.yaml deleted file mode 100644 index 21bd5ae0c..000000000 --- a/jjb/aai/aai-esr-server-csit.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- project: - name: aai-esr-server-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'aai-esr-server' - stream: 'master' - functionality: - - 'sanity-check': - trigger_jobs: - - 'aai-esr-server-master-docker-java-daily' - robot-options: '' - branch: 'master' diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index aab9db30e..21f7759b8 100644 --- 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 index 57364a377..000000000 --- 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/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml index 7a0daca97..a39b80697 100644 --- a/jjb/ccsdk/platform-plugins.yaml +++ b/jjb/ccsdk/platform-plugins.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: 'ccsdk/platform/plugins' stream: diff --git a/jjb/ccsdk/storage-esaas.yaml b/jjb/ccsdk/storage-esaas.yaml deleted file mode 100644 index 5593e2979..000000000 --- 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/ccsdk/storage-pgaas.yaml b/jjb/ccsdk/storage-pgaas.yaml index 730d9ce8e..5aab63426 100644 --- a/jjb/ccsdk/storage-pgaas.yaml +++ b/jjb/ccsdk/storage-pgaas.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: 'ccsdk/storage/pgaas' stream: diff --git a/jjb/dcaegen2/dcaegen2-csit.yaml b/jjb/dcaegen2/dcaegen2-csit.yaml index 62f53b877..f4e5d001c 100644 --- 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 0caab51fa..0ee8893e9 100644 --- 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 89860d94c..db1b504a0 100755 --- 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 |