diff options
| -rw-r--r-- | jjb/ccsdk/distribution.yaml | 2 | ||||
| -rw-r--r-- | jjb/ccsdk/parent.yaml | 2 | ||||
| -rw-r--r-- | jjb/ccsdk/sli-adaptors.yaml | 2 | ||||
| -rw-r--r-- | jjb/ccsdk/sli-core.yaml | 2 | ||||
| -rw-r--r-- | jjb/ccsdk/sli-northbound.yaml | 2 | ||||
| -rw-r--r-- | jjb/ccsdk/sli-plugins.yaml | 2 | ||||
| -rw-r--r-- | jjb/ccsdk/storage-esaas.yaml | 2 | ||||
| -rw-r--r-- | jjb/ccsdk/storage-pgaas.yaml | 2 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml | 2 | ||||
| -rw-r--r-- | jjb/vnfsdk/vnfsdk-refrepo.yaml | 19 |
10 files changed, 18 insertions, 19 deletions
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 5922c837f..8ed8716fd 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -15,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'ccsdk-distribution-settings' files: '**' archive-artifacts: '' diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index 3cc952de6..e8a667d17 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -15,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'ccsdk-parent-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 diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml index d2440fff3..8f41b5d9e 100644 --- a/jjb/ccsdk/sli-adaptors.yaml +++ b/jjb/ccsdk/sli-adaptors.yaml @@ -15,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'ccsdk-sli-adaptors-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 diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml index 548eaeb00..ed24c5aa7 100644 --- a/jjb/ccsdk/sli-core.yaml +++ b/jjb/ccsdk/sli-core.yaml @@ -15,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'ccsdk-sli-core-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 diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml index 4e3306f3f..1e505f64d 100644 --- a/jjb/ccsdk/sli-northbound.yaml +++ b/jjb/ccsdk/sli-northbound.yaml @@ -15,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'ccsdk-sli-northbound-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 diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml index f6d75ea91..be14584e0 100644 --- a/jjb/ccsdk/sli-plugins.yaml +++ b/jjb/ccsdk/sli-plugins.yaml @@ -15,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'ccsdk-sli-plugins-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 diff --git a/jjb/ccsdk/storage-esaas.yaml b/jjb/ccsdk/storage-esaas.yaml index 5c91767aa..49a957233 100644 --- a/jjb/ccsdk/storage-esaas.yaml +++ b/jjb/ccsdk/storage-esaas.yaml @@ -15,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' 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 diff --git a/jjb/ccsdk/storage-pgaas.yaml b/jjb/ccsdk/storage-pgaas.yaml index e24f67fd2..e1831e539 100644 --- a/jjb/ccsdk/storage-pgaas.yaml +++ b/jjb/ccsdk/storage-pgaas.yaml @@ -15,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'ccsdk-storage-pgaas-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 diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml index 77e16f973..7fa3c2538 100644 --- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml +++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml @@ -6,7 +6,7 @@ stream: - 'master': branch: 'master' - mvn-settings: 'vfc-nfvo-driver-svnfm-huawei-settings' + mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' subproject: - 'drv-vnfm-huawei': pom: 'huawei/vnfmadapter/pom.xml' diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml index 666f5ab41..df9bb7666 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml @@ -1,13 +1,28 @@ --- - project: name: vnfsdk-refrepo - project: 'vnfsdk/refrepo' + project-name: 'vnfsdk-refrepo' jobs: + - '{project-name}-{stream}-clm' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-stage-site-java': + site-pom: 'pom.xml' + trigger-job: '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-docker-version-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + maven-properties: | + skip.docker.build=false + skip.docker.tag=false + skip.docker.push=false - project-name: 'vnfsdk-refrepo' + project: 'vnfsdk/refrepo' stream: - 'master': branch: 'master' mvn-settings: 'vnfsdk-refrepo-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g |