diff options
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-services-heartbeat.yaml | 21 | ||||
| -rw-r--r-- | jjb/dmaap/dmaap-buscontroller-docker.yaml | 22 | ||||
| -rw-r--r-- | jjb/dmaap/dmaap-buscontroller.yaml | 8 | ||||
| -rw-r--r-- | jjb/policy/policy-common.yaml | 3 | ||||
| -rw-r--r-- | jjb/policy/policy-drools-applications.yaml | 3 | ||||
| -rw-r--r-- | jjb/policy/policy-drools-pdp.yaml | 5 | ||||
| -rw-r--r-- | jjb/policy/policy-engine.yaml | 5 | ||||
| -rwxr-xr-x | jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh | 8 | ||||
| -rw-r--r-- | jjb/vnfsdk/vnfsdk-ice-python.yaml | 11 |
9 files changed, 42 insertions, 44 deletions
diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml index e3d8fbaf7..295ce274f 100644 --- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml +++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml @@ -4,11 +4,32 @@ project-name: 'dcaegen2-services-heartbeat' jobs: - gerrit-maven-clm + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + project: 'dcaegen2/services/heartbeat' stream: - 'master': branch: 'master' mvn-settings: 'dcaegen2-services-heartbeat-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: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-services-heartbeat-sonar + jobs: + - gerrit-maven-sonar + cron: 'H 11 * * *' + build-node: ubuntu1604-basebuild-4c-4g + project: 'dcaegen2/services/heartbeat' + project-name: 'dcaegen2-services-heartbeat' + branch: 'master' + mvn-settings: 'dcaegen2-services-heartbeat-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/dmaap/dmaap-buscontroller-docker.yaml b/jjb/dmaap/dmaap-buscontroller-docker.yaml deleted file mode 100644 index a862a19bf..000000000 --- a/jjb/dmaap/dmaap-buscontroller-docker.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- - -- project: - name: dmaap-buscontroller-docker - project-name: 'dmaap-buscontroller-docker' - jobs: - - gerrit-maven-clm: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-daily' - - '{project-name}-{stream}-docker-version-java-daily' - project: 'dmaap/buscontroller' - stream: - - 'master': - branch: 'master' - mvn-settings: 'dmaap-buscontroller-settings' - files: '**' - archive-artifacts: '' - docker-pom: 'pom.xml' - mvn-profile: 'docker' - build-node: ubuntu1604-docker-8c-8g diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml index 591b88649..d06314e16 100644 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ b/jjb/dmaap/dmaap-buscontroller.yaml @@ -1,4 +1,5 @@ --- + - project: name: dmaap-buscontroller project-name: 'dmaap-buscontroller' @@ -10,7 +11,12 @@ - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' - mvn-goals: 'clean install' + mvn-goals: 'clean install docker:build' + - '{project-name}-{stream}-docker-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-goals: 'clean install docker:build' + build-node: ubuntu1604-docker-8c-8g project: 'dmaap/buscontroller' stream: - 'master': diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index e664f6e81..fb760424c 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -7,9 +7,6 @@ - '{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: 'policy/common' stream: diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index bdbfd497d..ccf078eed 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -8,9 +8,6 @@ - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily': disabled: true - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'policy/drools-applications' stream: diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index 920e1eb8d..3fc8f576e 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -6,11 +6,6 @@ - gerrit-maven-clm: mvn-params: '-DskipTests' - '{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}-merge-scm-mvn-script': mvn-goals: 'clean deploy -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index e379e4b04..a8a9a1766 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -6,11 +6,6 @@ - gerrit-maven-clm: build-timeout: 30 - '{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}-merge-scm-mvn-script': mvn-goals: 'clean deploy -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' diff --git a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh index 36a76a916..d729cb1bd 100755 --- a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh +++ b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh @@ -5,15 +5,19 @@ echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' CURRENTDIR="$(pwd)" echo $CURRENTDIR +echo '============== BUILDING ZTE IMAGE =================' chmod 755 ./zte/vmanager/docker/*.* ./zte/vmanager/docker/build_image.sh +echo '============== BUILDING HUAWEI IMAGE =================' chmod 755 ./huawei/vnfmadapter/VnfmadapterService/docker/*.* ./huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh +echo '============== BUILDING NOKIA V1 IMAGE =================' chmod 755 ./nokia/vnfmdriver/vfcadaptorservice/docker/*.* ./nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh -cd nokiav2/deployment -mvn package -Dexec.args="buildDocker pushImage" +echo '============== BUILDING NOKIA V2 IMAGE =================' +chmod 755 ./nokiav2/deployment/src/main/resources/*.sh +./nokiav2/deployment/src/main/resources/build_image.sh buildDocker pushImage diff --git a/jjb/vnfsdk/vnfsdk-ice-python.yaml b/jjb/vnfsdk/vnfsdk-ice-python.yaml index 4ef86a070..f8eb21393 100644 --- a/jjb/vnfsdk/vnfsdk-ice-python.yaml +++ b/jjb/vnfsdk/vnfsdk-ice-python.yaml @@ -8,9 +8,14 @@ - 'master': branch: 'master' subproject: - - ice: - path: '.' - pattern: '**' + - 'scripts': + path: 'validation-scripts' + pattern: 'validation-scripts/**' + pom: 'validation-scripts/pom.xml' + - 'server': + path: 'ice-server' + pattern: 'ice-server/**' + pom: 'ice-server/pom.xml' mvn-settings: 'vnfsdk-ice-settings' build-node: ubuntu1604-basebuild-4c-4g jobs: |