diff options
| -rw-r--r-- | jjb/dmaap/dmaap-buscontroller.yaml | 12 | ||||
| -rw-r--r-- | jjb/optf/optf-has.yaml | 1 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml | 4 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml | 3 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml | 1 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml | 3 | ||||
| -rw-r--r-- | jjb/vnfsdk/vnfsdk-ice-python.yaml | 6 |
7 files changed, 23 insertions, 7 deletions
diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml index 7db34c760..2b0206ac0 100644 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ b/jjb/dmaap/dmaap-buscontroller.yaml @@ -8,10 +8,14 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-daily': - mvn-goals: 'clean package docker:build -DpushImage' - docker-pom: 'pom.xml' - mvn-profile: 'docker' +# +# see DMAAP-334 for more details, but +# - '{project-name}-{stream}-docker-java-daily': +# doesn't support mvn-goals override, so trying this... + - '{project-name}-{stream}-docker-java-shell-daily': + mvn-goals: 'clean package -P docker docker:build -DpushImage' + # No-op + script: '/bin/true' project: 'dmaap/buscontroller' stream: diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml index 95eba8ff1..ffb16c0db 100644 --- a/jjb/optf/optf-has.yaml +++ b/jjb/optf/optf-has.yaml @@ -16,6 +16,7 @@ - gerrit-maven-clm - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily': diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml index e552aebec..88c316453 100644 --- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml +++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml @@ -1,7 +1,7 @@ --- - project: name: vfc-nfvo-driver-svnfm-huawei - project-name: 'vfc-nfvo-driver-svnfm' + project-name: 'vfc-nfvo-driver-svnfm-huawei' project: 'vfc/nfvo/driver/vnfm/svnfm' stream: - 'master': @@ -12,6 +12,8 @@ pom: 'huawei/pom.xml' pattern: 'huawei/**' jobs: + - gerrit-maven-clm: + mvn-params: '-f huawei/pom.xml' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml index 5da3ffaff..b60c4049d 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml @@ -1,7 +1,7 @@ --- - project: name: vfc-nfvo-driver-vnfm-svnfm-nokia - project-name: 'vfc-nfvo-driver-svnfm' + project-name: 'vfc-nfvo-driver-svnfm-nokia' project: 'vfc/nfvo/driver/vnfm/svnfm' stream: - 'master': @@ -13,6 +13,7 @@ pattern: 'nokia/vnfmdriver/**' jobs: - gerrit-maven-clm: + mvn-params: '-f nokia/pom.xml' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml index ba0e886d4..941662003 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml @@ -13,6 +13,7 @@ pattern: 'nokiav2/**' jobs: - gerrit-maven-clm: + mvn-params: '-f nokiav2/pom.xml' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml index df8ef1978..96d8055d1 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml @@ -2,7 +2,7 @@ - project: name: vfc-nfvo-driver-vnfm-svnfm-zte-java - project-name: 'vfc-nfvo-driver-vnfm-svnfm' + project-name: 'vfc-nfvo-driver-vnfm-svnfm-zte' project: 'vfc/nfvo/driver/vnfm/svnfm' stream: - 'master': @@ -14,6 +14,7 @@ pattern: 'zte/vmanager/**' jobs: - gerrit-maven-clm: + mvn-params: '-f zte/pom.xml' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' diff --git a/jjb/vnfsdk/vnfsdk-ice-python.yaml b/jjb/vnfsdk/vnfsdk-ice-python.yaml index 04386a753..ab737a567 100644 --- a/jjb/vnfsdk/vnfsdk-ice-python.yaml +++ b/jjb/vnfsdk/vnfsdk-ice-python.yaml @@ -4,6 +4,7 @@ project-name: 'vnfsdk-ice' project: 'vnfsdk/ice' pom: 'pom.xml' + python-version: python3 stream: - 'master': branch: 'master' @@ -12,16 +13,21 @@ path: 'validation-scripts' pattern: 'validation-scripts/**' pom: 'validation-scripts/pom.xml' + tox-dir: 'validation-scripts/' + tox-envs: '' - 'server': path: 'ice-server' pattern: 'ice-server/**' pom: 'ice-server/pom.xml' + tox-dir: 'ice-server/' + tox-envs: '' mvn-settings: 'vnfsdk-ice-settings' build-node: ubuntu1604-basebuild-4c-4g jobs: - gerrit-maven-clm - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{subproject}-python-staging-{stream}' - project: name: vnfsdk-ice-validation-scripts-sonar jobs: |