summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/aaf/aaf-authz-docker.yaml1
-rw-r--r--jjb/aai/aai-aai-service.yaml2
-rw-r--r--jjb/aai/aai-babel.yaml20
-rw-r--r--jjb/aai/aai-csit.yaml3
-rw-r--r--jjb/aai/aai-esr-server-csit.yaml14
-rw-r--r--jjb/ccsdk/platform-nbapi.yaml2
-rw-r--r--jjb/ccsdk/utils.yaml2
-rw-r--r--jjb/clamp/clamp.yaml1
-rw-r--r--jjb/global-templates-java.yaml152
-rw-r--r--jjb/policy/policy-api.yaml4
-rw-r--r--jjb/policy/policy-gui.yaml4
-rw-r--r--jjb/policy/policy-pap.yaml4
-rw-r--r--jjb/policy/policy-pdp.yaml4
-rw-r--r--jjb/sdnc/sdnc-adaptors.yaml2
-rw-r--r--jjb/sdnc/sdnc-core.yaml4
-rw-r--r--jjb/sdnc/sdnc-plugins.yaml2
16 files changed, 191 insertions, 30 deletions
diff --git a/jjb/aaf/aaf-authz-docker.yaml b/jjb/aaf/aaf-authz-docker.yaml
index d3e75b478..609aab3ba 100644
--- a/jjb/aaf/aaf-authz-docker.yaml
+++ b/jjb/aaf/aaf-authz-docker.yaml
@@ -11,6 +11,7 @@
- docker.pull.registry=nexus3.onap.org:10001
- docker.push.registry=nexus3.onap.org:10003
- '{project-name}-{stream}-release-java-daily-checkstyle':
+ setVersion: 'DontSetVersion'
mvn_properties:
- skipDockerBuild=true
- skipDockerTag=true
diff --git a/jjb/aai/aai-aai-service.yaml b/jjb/aai/aai-aai-service.yaml
index 01d5cfda1..4d1eb21ed 100644
--- a/jjb/aai/aai-aai-service.yaml
+++ b/jjb/aai/aai-aai-service.yaml
@@ -16,8 +16,6 @@
project: 'aai/aai-service'
stream:
- - 'master':
- branch: 'master'
- 'release-1.0.0':
branch: 'release-1.0.0'
mvn-settings: 'aai-aai-service-settings'
diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
new file mode 100644
index 000000000..d4760d222
--- /dev/null
+++ b/jjb/aai/aai-babel.yaml
@@ -0,0 +1,20 @@
+---
+- project:
+ name: aai-babel
+ project-name: 'aai-babel'
+ jobs:
+ - '{project-name}-{stream}-clm'
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-java-daily'
+ - '{project-name}-{stream}-aai-docker-java-daily':
+ pom: 'pom.xml'
+ mvn-goals: 'docker:build'
+ project: 'aai/babel'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'aai-babel-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/aai/aai-csit.yaml b/jjb/aai/aai-csit.yaml
index 44e5739e0..303aa5f5c 100644
--- a/jjb/aai/aai-csit.yaml
+++ b/jjb/aai/aai-csit.yaml
@@ -13,5 +13,8 @@
- 'traversal':
trigger_jobs:
- 'aai-traversal-{stream}-aai-docker-java-version-daily'
+ - 'esr-server':
+ trigger_jobs:
+ - 'aai-esr-server-{stream}-docker-java-daily'
robot-options: ''
branch: 'master'
diff --git a/jjb/aai/aai-esr-server-csit.yaml b/jjb/aai/aai-esr-server-csit.yaml
deleted file mode 100644
index 21bd5ae0c..000000000
--- a/jjb/aai/aai-esr-server-csit.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
- name: aai-esr-server-csit
- jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'aai-esr-server'
- stream: 'master'
- functionality:
- - 'sanity-check':
- trigger_jobs:
- - 'aai-esr-server-master-docker-java-daily'
- robot-options: ''
- branch: 'master'
diff --git a/jjb/ccsdk/platform-nbapi.yaml b/jjb/ccsdk/platform-nbapi.yaml
index 98a5b0a71..4292eb3e0 100644
--- a/jjb/ccsdk/platform-nbapi.yaml
+++ b/jjb/ccsdk/platform-nbapi.yaml
@@ -6,7 +6,7 @@
- '{project-name}-{stream}-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-no-sonar'
project: 'ccsdk/platform/nbapi'
stream:
diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml
index 6f445a122..5a2e550b4 100644
--- a/jjb/ccsdk/utils.yaml
+++ b/jjb/ccsdk/utils.yaml
@@ -6,7 +6,7 @@
- '{project-name}-{stream}-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-no-sonar'
project: 'ccsdk/utils'
stream:
diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml
index d5b04fecb..da9bc2548 100644
--- a/jjb/clamp/clamp.yaml
+++ b/jjb/clamp/clamp.yaml
@@ -10,6 +10,7 @@
- docker.pull.registry=nexus3.onap.org:10001
- docker.push.registry=nexus3.onap.org:10003
- '{project-name}-{stream}-release-java-daily-checkstyle':
+ setVersion: 'DoSetVersion'
mvn_properties:
- skipDockerBuild=true
- skipDockerTag=true
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 5e69145a0..2c82db479 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -435,6 +435,72 @@
maven-version: '{maven-version}'
- job-template:
+ # Job template for Java daily release jobs
+ #
+ # The purpose of this job template is to run "maven version && maven clean
+ # deploy" for projects using this template.
+ #
+ # Required Variables:
+ # branch: git branch (eg. stable/lithium or master)
+ name: '{project-name}-{stream}-release-java-daily-no-sonar'
+
+ project-type: freestyle
+ node: '{build-node}'
+ maven-deploy-properties:
+ properties:
+ - infra-properties:
+ build-days-to-keep: '{build-days-to-keep}'
+
+ parameters:
+ - infra-parameters:
+ project: '{project}'
+ branch: '{branch}'
+ refspec: 'refs/heads/{branch}'
+ artifacts: '{archive-artifacts}'
+ - maven-exec:
+ maven-version: '{maven-version}'
+
+ scm:
+ - gerrit-trigger-scm:
+ refspec: ''
+ choosing-strategy: 'default'
+ submodule-recursive: '{submodule-recursive}'
+
+ wrappers:
+ - infra-wrappers:
+ build-timeout: '{build-timeout}'
+
+ triggers:
+ # 11 AM UTC
+ - timed: 'H 11 * * *'
+ - gerrit-trigger-release-manually:
+ server: '{server-name}'
+ project: '{project}'
+ branch: '{branch}'
+
+ builders:
+ - provide-maven-settings:
+ global-settings-file: 'global-settings'
+ settings-file: '{mvn-settings}'
+
+ - maven-target:
+ maven-version: '{maven-version}'
+ goals: 'clean deploy -B
+ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
+ properties:
+ - '{maven-deploy-properties}'
+ java-opts:
+ - '-Xmx4096m -XX:MaxPermSize=512m'
+ settings: '{mvn-settings}'
+ settings-type: cfp
+ global-settings: 'global-settings'
+ global-settings-type: cfp
+
+ publishers:
+ - infra-shiplogs:
+ maven-version: '{maven-version}'
+
+- job-template:
# Job template for Java daily release jobs running checkstyle at the end
# When checkstyle will be fully incorporated, it is meant to replace
# '{project-name}-{stream}-release-java-daily'
@@ -477,6 +543,22 @@
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
+ - conditional-step:
+ condition-kind: regex-match
+ regex: DoSetVersion
+ label: '{setVersion}'
+ steps:
+ - inject:
+ properties-file: version.properties
+ - maven-target:
+ maven-version: '{maven-version}'
+ goals: 'versions:set versions:update-child-modules versions:commit -B'
+ properties:
+ - 'newVersion=${{release_version}}'
+ settings: '{mvn-settings}'
+ settings-type: cfp
+ global-settings: 'global-settings'
+ global-settings-type: cfp
- maven-target:
maven-version: '{maven-version}'
goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}} -B
@@ -793,6 +875,76 @@
maven-version: '{maven-version}'
- job-template:
+ # Job template for Java daily release jobs with POM not at the root
+ #
+ # The purpose of this job template is to run "maven version && maven clean
+ # deploy" for projects using this template.
+ #
+ # Required Variables:
+ # branch: git branch (eg. stable/lithium or master)
+ # pom: name/location of the pom.xml file relative to the workspace
+
+
+ name: '{project-name}-{stream}-{subproject}-release-java-daily-no-sonar'
+
+ project-type: freestyle
+ node: '{build-node}'
+ maven-deploy-properties:
+ properties:
+ - infra-properties:
+ build-days-to-keep: '{build-days-to-keep}'
+
+ parameters:
+ - infra-parameters:
+ project: '{project}'
+ branch: '{branch}'
+ refspec: 'refs/heads/{branch}'
+ artifacts: '{archive-artifacts}'
+ - maven-exec:
+ maven-version: '{maven-version}'
+
+ scm:
+ - gerrit-trigger-scm:
+ refspec: ''
+ choosing-strategy: 'default'
+ submodule-recursive: '{submodule-recursive}'
+
+ wrappers:
+ - infra-wrappers:
+ build-timeout: '{build-timeout}'
+
+ triggers:
+ # 11 AM UTC
+ - timed: 'H 11 * * *'
+ - gerrit-trigger-release-manually:
+ server: '{server-name}'
+ project: '{project}'
+ branch: '{branch}'
+
+ builders:
+ - provide-maven-settings:
+ global-settings-file: 'global-settings'
+ settings-file: '{mvn-settings}'
+
+ - maven-target:
+ maven-version: '{maven-version}'
+ pom: '{pom}'
+ goals: 'clean deploy -B
+ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
+ properties:
+ - '{maven-deploy-properties}'
+ java-opts:
+ - '-Xmx4096m -XX:MaxPermSize=512m'
+ settings: '{mvn-settings}'
+ settings-type: cfp
+ global-settings: 'global-settings'
+ global-settings-type: cfp
+
+ publishers:
+ - infra-shiplogs:
+ maven-version: '{maven-version}'
+
+- job-template:
# Job template for Java merge jobs
#
# The purpose of this job template is to run "maven clean deploy" for
diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index 4e5abb1f2..a16f0aaa2 100644
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -6,10 +6,10 @@
- '{project-name}-{stream}-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-no-sonar'
- '{project-name}-{stream}-stage-site-java':
site-pom: 'pom.xml'
- trigger-job: '{project-name}-{stream}-release-version-java-daily'
+ trigger-job: '{project-name}-{stream}-release-version-java-daily-no-sonar'
project: 'policy/api'
stream:
diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
index 14f26ba1e..db9684541 100644
--- a/jjb/policy/policy-gui.yaml
+++ b/jjb/policy/policy-gui.yaml
@@ -6,10 +6,10 @@
- '{project-name}-{stream}-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-no-sonar'
- '{project-name}-{stream}-stage-site-java':
site-pom: 'pom.xml'
- trigger-job: '{project-name}-{stream}-release-version-java-daily'
+ trigger-job: '{project-name}-{stream}-release-version-java-daily-no-sonar'
project: 'policy/gui'
stream:
diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index 71f1d103b..f0d15bac5 100644
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -6,10 +6,10 @@
- '{project-name}-{stream}-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-no-sonar'
- '{project-name}-{stream}-stage-site-java':
site-pom: 'pom.xml'
- trigger-job: '{project-name}-{stream}-release-version-java-daily'
+ trigger-job: '{project-name}-{stream}-release-version-java-daily-no-sonar'
project: 'policy/pap'
stream:
diff --git a/jjb/policy/policy-pdp.yaml b/jjb/policy/policy-pdp.yaml
index 37d6628c7..36e2616b2 100644
--- a/jjb/policy/policy-pdp.yaml
+++ b/jjb/policy/policy-pdp.yaml
@@ -6,10 +6,10 @@
- '{project-name}-{stream}-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-no-sonar'
- '{project-name}-{stream}-stage-site-java':
site-pom: 'pom.xml'
- trigger-job: '{project-name}-{stream}-release-version-java-daily'
+ trigger-job: '{project-name}-{stream}-release-version-java-daily-no-sonar'
project: 'policy/pdp'
stream:
diff --git a/jjb/sdnc/sdnc-adaptors.yaml b/jjb/sdnc/sdnc-adaptors.yaml
index 7cace1fd0..7cf1c1e61 100644
--- a/jjb/sdnc/sdnc-adaptors.yaml
+++ b/jjb/sdnc/sdnc-adaptors.yaml
@@ -6,7 +6,7 @@
- '{project-name}-{stream}-clm'
- '{project-name}-{stream}-verify-java-skip-tests'
- '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
project: 'sdnc/adaptors'
stream:
diff --git a/jjb/sdnc/sdnc-core.yaml b/jjb/sdnc/sdnc-core.yaml
index 6226cacc3..622787714 100644
--- a/jjb/sdnc/sdnc-core.yaml
+++ b/jjb/sdnc/sdnc-core.yaml
@@ -10,10 +10,10 @@
- '{project-name}-{stream}-clm'
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- - '{project-name}-{stream}-{subproject}-release-java-daily'
+ - '{project-name}-{stream}-{subproject}-release-java-daily-no-sonar'
- '{project-name}-{stream}-verify-java-skip-tests'
- '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
project: 'sdnc/core'
stream:
diff --git a/jjb/sdnc/sdnc-plugins.yaml b/jjb/sdnc/sdnc-plugins.yaml
index 54a188575..5118cc179 100644
--- a/jjb/sdnc/sdnc-plugins.yaml
+++ b/jjb/sdnc/sdnc-plugins.yaml
@@ -6,7 +6,7 @@
- '{project-name}-{stream}-clm'
- '{project-name}-{stream}-verify-java-skip-tests'
- '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
project: 'sdnc/plugins'
stream: