diff options
| -rw-r--r-- | jjb/policy/policy-drools-applications.yaml | 3 | ||||
| -rw-r--r-- | jjb/policy/policy-drools-pdp.yaml | 12 | ||||
| -rw-r--r-- | jjb/policy/policy-engine.yaml | 14 | ||||
| -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, 30 insertions, 6 deletions
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index c5aac6bf8..bdbfd497d 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -6,7 +6,8 @@ - gerrit-maven-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': + disabled: true - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index 7b05edfc8..920e1eb8d 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -11,6 +11,18 @@ - '{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' + script: + !include-raw-escape: 'include-raw-docker-merge.sh' + - '{project-name}-{stream}-docker-java-version-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'clean deploy -B + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + script: + !include-raw-escape: 'include-raw-docker-release.sh' + disabled: true project: 'policy/drools-pdp' stream: diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index 60e2491ee..e379e4b04 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -7,10 +7,22 @@ build-timeout: 30 - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily': + - '{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' + script: + !include-raw-escape: 'include-raw-docker-merge.sh' + - '{project-name}-{stream}-docker-java-version-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'clean deploy -B + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + script: + !include-raw-escape: 'include-raw-docker-release.sh' + disabled: true project: 'policy/engine' stream: 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' |