diff options
Diffstat (limited to 'jjb')
-rw-r--r-- | jjb/aai/aai-resources.yaml | 7 | ||||
-rw-r--r-- | jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml | 5 | ||||
-rw-r--r-- | jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml | 2 | ||||
-rw-r--r-- | jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml | 3 | ||||
-rw-r--r-- | jjb/vfc/vfc-nfvo-lcm-java.yaml | 4 |
5 files changed, 10 insertions, 11 deletions
diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index 319b54473..14bffbc8a 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -12,10 +12,9 @@ site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' disabled: true - - '{project-name}-{stream}-aai-docker-java-version-daily': - pom: 'aai-resources/pom.xml' - mvn-goals: 'docker:build docker:push' - disabled: true + - '{project-name}-{stream}-docker-java-daily': + docker-pom: 'aai-resources/pom.xml' + mvn-profile: 'docker' project: 'aai/resources' stream: diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml index d458c598b..4470606da 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml @@ -26,13 +26,14 @@ archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g - project: - name: vfc-nfvo-driver-vnfm-gvnfm-sonar + name: vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter-sonar jobs: - gerrit-maven-sonar cron: 'H 11 * * *' + mvn-params: '-f gvnfmadapter/pom.xml' build-node: ubuntu1604-basebuild-4c-4g project: 'vfc/nfvo/driver/vnfm/gvnfm' - project-name: 'vfc-nfvo-driver-vnfm-gvnfm' + project-name: 'vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter' branch: 'master' mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings' mvn-goals: 'clean install' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml index 7f966f915..5da3ffaff 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml @@ -9,7 +9,7 @@ mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' subproject: - 'drv-vnfm-nokia': - pom: 'nokia/vnfmdirver/pom.xml' + pom: 'nokia/vnfmdriver/pom.xml' pattern: 'nokia/vnfmdriver/**' jobs: - gerrit-maven-clm: diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml index 02ad8593b..ba0e886d4 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml @@ -13,7 +13,6 @@ pattern: 'nokiav2/**' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' @@ -24,9 +23,9 @@ name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-sonar jobs: - gerrit-maven-sonar + cron: 'H 11 * * *' mvn-params: '-f nokiav2/pom.xml' build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'vfc/nfvo/driver/vnfm/svnfm' project-name: 'vfc-nfvo-driver-vnfm-svnfm-nokiav2' branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml index b25010af4..a1ec2fd49 100644 --- a/jjb/vfc/vfc-nfvo-lcm-java.yaml +++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml @@ -20,13 +20,13 @@ !include-raw-escape: 'build-nfvo-lcm-docker-image.sh' files: '**' archive-artifacts: '' - build-node: ubuntu1604-basebuild-4c-4g + build-node: centos7-redis-4c-4g - project: name: vfc-nfvo-lcm-sonar jobs: - gerrit-maven-sonar cron: 'H 11 * * *' - build-node: ubuntu1604-basebuild-4c-4g + build-node: centos7-redis-4c-4g project: 'vfc/nfvo/lcm' project-name: 'vfc-nfvo-lcm' branch: 'master' |