summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/externalapi/externalapi-nbi-csit.yaml14
m---------jjb/global-jjb0
-rw-r--r--jjb/music/music-jar.yaml22
-rw-r--r--jjb/onap-jjb/onap-pypi-template.yaml8
-rw-r--r--jjb/policy/policy-drools-pdp.yaml1
-rw-r--r--jjb/portal-sdk/portal-sdk.yaml4
-rw-r--r--jjb/sdc/sdc.yaml2
-rw-r--r--jjb/so/so-csit.yaml5
-rw-r--r--jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml6
-rw-r--r--jjb/vnfsdk/vnfsdk-ice-python.yaml8
-rw-r--r--jjb/vnfsdk/vnfsdk-pkgtools-python.yaml4
-rw-r--r--jjb/vnfsdk/vnfsdk-refrepo.yaml2
-rw-r--r--jjb/vnfsdk/vnfsdk-ves-agent.yaml2
-rw-r--r--jjb/vvp/vvp-validation-scripts.yaml13
14 files changed, 70 insertions, 21 deletions
diff --git a/jjb/externalapi/externalapi-nbi-csit.yaml b/jjb/externalapi/externalapi-nbi-csit.yaml
new file mode 100644
index 000000000..8f15b48e8
--- /dev/null
+++ b/jjb/externalapi/externalapi-nbi-csit.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+ name: externalapi-nbi-csit
+ jobs:
+ - '{project-name}-{stream}-verify-csit-{functionality}'
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: 'externalapi-nbi'
+ stream: 'master'
+ functionality:
+ - 'healthcheck':
+ trigger_jobs:
+ - '{project-name}-{stream}-release-java-daily-checkstyle'
+ robot-options: ''
+ branch: 'master'
diff --git a/jjb/global-jjb b/jjb/global-jjb
-Subproject edf56a1e9ce91d936388621ecfc850162aabfeb
+Subproject 9f237eb9ddb18fe6e01cbadea0a75e36a0baf8d
diff --git a/jjb/music/music-jar.yaml b/jjb/music/music-jar.yaml
new file mode 100644
index 000000000..dba2ab2bd
--- /dev/null
+++ b/jjb/music/music-jar.yaml
@@ -0,0 +1,22 @@
+---
+- project:
+ name: music-jar
+ project-name: 'music'
+ subproject:
+ - 'music-jar':
+ pom: 'jar/pom.xml'
+ pattern: 'jar/**'
+ jobs:
+ - gerrit-maven-clm:
+ mvn-params: '-f jar/pom.xml'
+ - '{project-name}-{stream}-{subproject}-verify-java'
+ - '{project-name}-{stream}-{subproject}-merge-java'
+ project: 'music'
+ stream:
+ - 'release-2.5.3':
+ branch: 'release-2.5.3'
+ mvn-settings: 'music-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-builder-4c-4g
+
diff --git a/jjb/onap-jjb/onap-pypi-template.yaml b/jjb/onap-jjb/onap-pypi-template.yaml
index bfd709905..632bc8e2a 100644
--- a/jjb/onap-jjb/onap-pypi-template.yaml
+++ b/jjb/onap-jjb/onap-pypi-template.yaml
@@ -88,7 +88,7 @@
- file-id: pypirc
target: '$HOME/.pypirc'
- shell:
- !include-raw-escape: ../shell/pypi-dist-build.sh
+ !include-raw-escape: ../../shell/pypi-dist-build.sh
- publish-pypi:
pypi-server: staging
@@ -121,7 +121,7 @@
- file-id: pypirc
target: '$HOME/.pypirc'
- shell:
- !include-raw-escape: ../shell/pypi-dist-build.sh
+ !include-raw-escape: ../../shell/pypi-dist-build.sh
- publish-pypi:
pypi-server: release
@@ -155,7 +155,7 @@
- file-id: pypirc
target: '$HOME/.pypirc'
- shell:
- !include-raw-escape: ../shell/pypi-dist-build.sh
+ !include-raw-escape: ../../shell/pypi-dist-build.sh
- publish-pypi:
pypi-server: staging
@@ -188,7 +188,7 @@
- file-id: pypirc
target: '$HOME/.pypirc'
- shell:
- !include-raw-escape: ../shell/pypi-dist-build.sh
+ !include-raw-escape: ../../shell/pypi-dist-build.sh
- publish-pypi:
pypi-server: release
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index fe1d7e2ab..030472a8a 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -11,7 +11,6 @@
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
script:
!include-raw-escape: 'include-raw-docker-merge.sh'
- - '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-docker-java-version-shell-daily':
docker-pom: 'pom.xml'
mvn-goals: 'clean deploy -B
diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml
index 9277a11b0..65e201159 100644
--- a/jjb/portal-sdk/portal-sdk.yaml
+++ b/jjb/portal-sdk/portal-sdk.yaml
@@ -22,6 +22,10 @@
branch: 'release-2.1.0'
- 'release-2.1.1':
branch: 'release-2.1.1'
+ - 'release-2.2.0':
+ branch: 'release-2.2.0'
+ - 'release-2.3.0':
+ branch: 'release-2.3.0'
mvn-settings: 'portal-sdk-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index e751311ef..4b63bde9d 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -31,5 +31,5 @@
project-name: 'sdc'
branch: 'master'
mvn-settings: 'sdc-settings'
- mvn-goals: 'clean install'
+ mvn-goals: 'clean install -Djacoco.skip=false'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/so/so-csit.yaml b/jjb/so/so-csit.yaml
index b0df7e889..947cde5fb 100644
--- a/jjb/so/so-csit.yaml
+++ b/jjb/so/so-csit.yaml
@@ -7,10 +7,7 @@
project-name: 'so'
stream: 'master'
functionality:
- - 'sanity-check':
- trigger_jobs:
- - 'so-master-docker-version-java-daily'
- - 'hpa':
+ - 'integration-testing':
trigger_jobs:
- 'so-master-docker-version-java-daily'
robot-options: ''
diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
index cee261684..aff445b5b 100644
--- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
@@ -21,13 +21,13 @@
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{subproject}-python-staging-{stream}'
- - '{project-name}-{stream}-docker-version-java-daily':
+ - '{project-name}-{stream}-docker-java-daily':
docker-pom: 'pom.xml'
mvn-profile: 'docker'
- project:
- name: vnfsdk-dovetail-integration-sonar
+ name: vnfsdk-dovetail-integration-tox-sonar
jobs:
- - gerrit-maven-sonar
+ - gerrit-tox-sonar
cron: 'H 11 * * *'
build-node: ubuntu1604-builder-4c-4g
project: 'vnfsdk/dovetail-integration'
diff --git a/jjb/vnfsdk/vnfsdk-ice-python.yaml b/jjb/vnfsdk/vnfsdk-ice-python.yaml
index 8d76712e1..ee5b5adf8 100644
--- a/jjb/vnfsdk/vnfsdk-ice-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-ice-python.yaml
@@ -38,9 +38,9 @@
docker-pom: 'docker/pom.xml'
mvn-profile: 'docker'
- project:
- name: vnfsdk-ice-validation-scripts-sonar
+ name: vnfsdk-ice-validation-scripts-tox-sonar
jobs:
- - gerrit-maven-sonar
+ - gerrit-tox-sonar
cron: 'H 11 * * *'
mvn-params: '-f validation-scripts/pom.xml'
build-node: ubuntu1604-builder-4c-4g
@@ -51,9 +51,9 @@
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
- project:
- name: vnfsdk-ice-ice-server-sonar
+ name: vnfsdk-ice-ice-server-tox-sonar
jobs:
- - gerrit-maven-sonar
+ - gerrit-tox-sonar
cron: 'H 11 * * *'
mvn-params: '-f ice-server/pom.xml'
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
index 5479abe58..e68ea1d7e 100644
--- a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
@@ -20,9 +20,9 @@
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{subproject}-python-staging-{stream}'
- project:
- name: vnfsdk-pkgtools-sonar
+ name: vnfsdk-pkgtools-tox-sonar
jobs:
- - gerrit-maven-sonar
+ - gerrit-tox-sonar
cron: 'H 11 * * *'
build-node: ubuntu1604-builder-4c-4g
project: 'vnfsdk/pkgtools'
diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
index 83081708e..30c3e0750 100644
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -10,7 +10,7 @@
- '{project-name}-{stream}-aai-docker-java-daily':
pom: 'vnfmarket-be/deployment/docker/docker-refrepo/pom.xml'
mvn-goals: 'docker:build'
- docker-image-name: 'onap/refrepo'
+ docker-image-name: 'onap/vnfsdk/refrepo'
- '{project-name}-{stream}-docker-version-java-daily':
docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml'
mvn-profile: 'docker'
diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
index 95f9b8a85..ac77b7701 100644
--- a/jjb/vnfsdk/vnfsdk-ves-agent.yaml
+++ b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
@@ -13,7 +13,7 @@
mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+ - '{project-name}-{stream}-{subproject}-release-java-daily'
project: 'vnfsdk/ves-agent'
stream:
diff --git a/jjb/vvp/vvp-validation-scripts.yaml b/jjb/vvp/vvp-validation-scripts.yaml
index c0d7185cd..7a57deb3a 100644
--- a/jjb/vvp/vvp-validation-scripts.yaml
+++ b/jjb/vvp/vvp-validation-scripts.yaml
@@ -16,3 +16,16 @@
jobs:
- gerrit-python-xc-clm
- '{project-name}-{stream}-{subproject}-verify-python'
+- project:
+ name: vvp-validation-scripts-sonar
+ jobs:
+ - gerrit-maven-sonar
+ cron: 'H 11 * * *'
+ build-node: ubuntu1604-builder-4c-4g
+ project: 'vvp/validation-scripts'
+ project-name: 'vvp-validation-scripts'
+ branch: 'master'
+ mvn-settings: 'vvp-validation-scripts-settings'
+ mvn-goals: 'clean install'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+