Merge "Add python release to jjb jobs"
diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml
index 335c275..ccc77be 100644
--- a/jjb/aai/aai-esr-gui.yaml
+++ b/jjb/aai/aai-esr-gui.yaml
@@ -7,7 +7,8 @@
- '{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-java-daily':
+ mvn-params: '-Dmaven.test.skip=true'
project: 'aai/esr-gui'
stream:
diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml
index a555017..624caef 100644
--- a/jjb/aai/aai-esr-server.yaml
+++ b/jjb/aai/aai-esr-server.yaml
@@ -7,7 +7,8 @@
- '{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-java-daily':
+ mvn-params: '-Dmaven.test.skip=true'
project: 'aai/esr-server'
stream:
diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 3e12ba6..1480c55 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -10,6 +10,7 @@
- '{project-name}-{stream}-docker-java-daily':
docker-pom: 'aai-resources/pom.xml'
mvn-profile: 'docker'
+ mvn-params: '-Dmaven.test.skip=true'
project: 'aai/resources'
stream:
- 'master':
diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index 8726ad4..bfc73a3 100644
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -10,6 +10,7 @@
- '{project-name}-{stream}-docker-java-daily':
docker-pom: 'aai-traversal/pom.xml'
mvn-profile: 'docker'
+ mvn-params: '-Dmaven.test.skip=true'
project: 'aai/traversal'
stream:
- 'master':
diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index c3f9edc..5d23d53 100644
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -8,8 +8,10 @@
- '{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-name}-{stream}-docker-java-daily':
+ mvn-params: '-Dmaven.test.skip=true'
+ - '{project-name}-{stream}-docker-version-java-daily':
+ mvn-params: '-Dmaven.test.skip=true'
- '{project-name}-docker-image-blessing'
project: 'appc/deployment'
diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index 1fd6e20..b82a3ec 100644
--- a/jjb/appc/appc-master.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -11,7 +11,8 @@
build-node: ubuntu1604-builder-8c-8g
- '{project-name}-{stream}-merge-java':
build-node: ubuntu1604-builder-8c-8g
- - '{project-name}-{stream}-release-version-java-daily'
+ - '{project-name}-{stream}-release-version-java-daily':
+ build-node: ubuntu1604-builder-8c-8g
project: 'appc'
stream:
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 5072b99..a11353e 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -7,8 +7,10 @@
- '{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-name}-{stream}-docker-java-daily':
+ mvn-params: '-Dmaven.test.skip=true'
+ - '{project-name}-{stream}-docker-version-java-daily':
+ mvn-params: '-Dmaven.test.skip=true'
project: 'ccsdk/distribution'
stream:
diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml
index b289b70..6d775eb 100644
--- a/jjb/clamp/clamp.yaml
+++ b/jjb/clamp/clamp.yaml
@@ -23,6 +23,7 @@
setVersion: 'DoSetVersion'
docker-pom: 'pom.xml'
mvn-profile: 'docker'
+ mvn-params: '-Dmaven.test.skip=true'
maven-properties: |
skip.docker.build=false
skip.docker.tag=false
diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml
index 22f043e..26327ae 100644
--- a/jjb/dmaap/dmaap-messagerouter-docker.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-docker.yaml
@@ -8,8 +8,8 @@
- '{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-name}-{stream}-docker-java-daily':
+ mvn-params: '-Dmaven.test.skip=true'
project: 'dmaap/messagerouter/messageservice'
stream:
- 'master':
diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml
index 592a886..b188403 100644
--- a/jjb/externalapi/externalapi-nbi.yaml
+++ b/jjb/externalapi/externalapi-nbi.yaml
@@ -10,6 +10,7 @@
- '{project-name}-{stream}-docker-version-java-daily':
docker-pom: 'pom.xml'
mvn-profile: 'docker'
+ mvn-params: '-Dmaven.test.skip=true'
project: 'externalapi/nbi'
stream:
- 'master':
diff --git a/jjb/global-jjb b/jjb/global-jjb
index 9f237eb..4925983 160000
--- a/jjb/global-jjb
+++ b/jjb/global-jjb
@@ -1 +1 @@
-Subproject commit 9f237eb9ddb18fe6e01cbadea0a75e36a0baf8d7
+Subproject commit 492598352aa58d3aace7f944ef8e7a8a2e82c8a2
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 49446ef..d7ca143 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -51,13 +51,12 @@
- maven-target:
maven-version: '{maven-version}'
pom: '{pom}'
- goals: 'clean deploy -B -P {mvn-profile}'
+ goals: 'clean deploy -B -P {mvn-profile} {mvn-params}'
settings: '{mvn-settings}'
settings-type: cfp
global-settings: 'global-settings'
global-settings-type: cfp
properties:
- - maven.test.skip=true
- docker.pull.registry=nexus3.onap.org:10001
- docker.push.registry=nexus3.onap.org:10003
diff --git a/jjb/global-templates-docker.yaml b/jjb/global-templates-docker.yaml
index 96aed9d..8145efa 100644
--- a/jjb/global-templates-docker.yaml
+++ b/jjb/global-templates-docker.yaml
@@ -112,6 +112,7 @@
DOCKER_NAME={docker_name}
DOCKER_ROOT={docker_root}
DOCKER_TAG={docker_tag}
+ BUILD_MODE=SNAPSHOT
DOCKERREGISTRY={docker_registry}
# Do the docker build
- shell: !include-raw: ../shell/docker-build.sh
@@ -151,6 +152,7 @@
DOCKER_NAME={docker_name}
DOCKER_ROOT={docker_root}
DOCKER_TAG={docker_tag}
+ BUILD_MODE=SNAPSHOT
DOCKERREGISTRY={docker_registry}
# Do the docker build
- shell: !include-raw: ../shell/docker-build.sh
@@ -171,7 +173,7 @@
# branch: git branch (eg. stable/lithium or master)
<<: *docker_job_boiler_plate
- docker_registry: '$DOCKER_REGISTRY:10004'
+ docker_registry: '$DOCKER_REGISTRY:10003'
scm:
- lf-infra-gerrit-scm:
@@ -196,6 +198,7 @@
DOCKER_ROOT={docker_root}
DOCKER_TAG={docker_tag}
DOCKERREGISTRY={docker_registry}
+ BUILD_MODE=STAGING
# Do the docker build
- shell: !include-raw: ../shell/snapshot-strip.sh
@@ -241,6 +244,7 @@
DOCKER_ROOT={docker_root}
DOCKER_TAG={docker_tag}
DOCKERREGISTRY={docker_registry}
+ BUILD_MODE=SNAPSHOT
# Do the docker build
- shell: !include-raw: ../shell/docker-build.sh
- inject:
@@ -280,6 +284,7 @@
DOCKER_ROOT={docker_root}
DOCKER_TAG={docker_tag}
DOCKERREGISTRY={docker_registry}
+ BUILD_MODE=SNAPSHOT
# Do the docker build
- shell: !include-raw: ../shell/docker-build.sh
- inject:
@@ -299,7 +304,7 @@
# branch: git branch (eg. stable/lithium or master)
<<: *docker_job_boiler_plate
- docker_registry: '$DOCKER_REGISTRY:10004'
+ docker_registry: '$DOCKER_REGISTRY:10003'
scm:
- lf-infra-gerrit-scm:
@@ -324,6 +329,7 @@
DOCKER_ROOT={docker_root}
DOCKER_TAG={docker_tag}
DOCKERREGISTRY={docker_registry}
+ BUILD_MODE=STAGING
# Do the docker build
- shell: !include-raw: ../shell/snapshot-strip.sh
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index b1750d6..7683924 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -1217,6 +1217,8 @@
artifacts: '{archive-artifacts}'
- maven-exec:
maven-version: '{maven-version}'
+ - maven-params:
+ mvn-params: '{mvn-params}'
scm:
- gerrit-trigger-scm:
@@ -1250,6 +1252,7 @@
pom: '{docker-pom}'
# use default as mvn-profile if profile is not needed
mvn-profile: '{mvn-profile}'
+ mvn-params: '{mvn-params}'
publishers:
- infra-shiplogs:
@@ -1285,6 +1288,8 @@
artifacts: '{archive-artifacts}'
- maven-exec:
maven-version: '{maven-version}'
+ - maven-params:
+ mvn-params: '{mvn-params}'
scm:
- gerrit-trigger-scm:
refspec: ''
@@ -1328,6 +1333,7 @@
properties: '{maven-properties}'
# use default as mvn-profile if profile is not needed
mvn-profile: '{mvn-profile}'
+ mvn-params: '{mvn-params}'
publishers:
- infra-shiplogs:
maven-version: '{maven-version}'
@@ -1597,6 +1603,8 @@
artifacts: '{archive-artifacts}'
- maven-exec:
maven-version: '{maven-version}'
+ - maven-params:
+ mvn-params: '{mvn-params}'
scm:
- gerrit-trigger-scm:
@@ -1643,6 +1651,7 @@
pom: '{docker-pom}'
# use default as mvn-profile if profile is not needed
mvn-profile: '{mvn-profile}'
+ mvn-params: '{mvn-params}'
publishers:
- infra-shiplogs:
@@ -1678,6 +1687,8 @@
artifacts: '{archive-artifacts}'
- maven-exec:
maven-version: '{maven-version}'
+ - maven-params:
+ mvn-params: '{mvn-params}'
scm:
- gerrit-trigger-scm:
@@ -1726,6 +1737,7 @@
pom: '{docker-pom}'
# use default as mvn-profile if profile is not needed
mvn-profile: '{mvn-profile}'
+ mvn-params: '{mvn-params}'
publishers:
- infra-shiplogs:
diff --git a/jjb/holmes/holmes-dsa.yaml b/jjb/holmes/holmes-dsa.yaml
index a44a9e5..849b429 100644
--- a/jjb/holmes/holmes-dsa.yaml
+++ b/jjb/holmes/holmes-dsa.yaml
@@ -7,7 +7,8 @@
- '{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-java-daily':
+ mvn-params: '-Dmaven.test.skip=true'
project: 'holmes/dsa'
stream:
diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml
index db1eeee..e783a8e 100644
--- a/jjb/holmes/holmes-engine-mgt.yaml
+++ b/jjb/holmes/holmes-engine-mgt.yaml
@@ -7,7 +7,8 @@
- '{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-java-daily':
+ mvn-params: '-Dmaven.test.skip=true'
project: 'holmes/engine-management'
stream:
diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml
index 3b5638e..5dcd132 100644
--- a/jjb/holmes/holmes-rule-mgt.yaml
+++ b/jjb/holmes/holmes-rule-mgt.yaml
@@ -7,7 +7,8 @@
- '{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-java-daily':
+ mvn-params: '-Dmaven.test.skip=true'
project: 'holmes/rule-management'
stream:
diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml
index 3b0e725..8469345 100644
--- a/jjb/integration/integration-docker.yaml
+++ b/jjb/integration/integration-docker.yaml
@@ -13,6 +13,10 @@
- 'sniroemulator':
pom: 'test/mocks/sniroemulator/pom.xml'
pattern: 'test/mocks/sniroemulator/**'
+ subproject:
+ - 'pnfsimulator':
+ pom: 'test/mocks/pnfsimulator/pom.xml'
+ pattern: 'test/mocks/pnfsimulator/**'
mvn-settings: 'integration-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/integration/integration-templates-docker.yaml b/jjb/integration/integration-templates-docker.yaml
index c8041a2..15f2074 100644
--- a/jjb/integration/integration-templates-docker.yaml
+++ b/jjb/integration/integration-templates-docker.yaml
@@ -86,8 +86,8 @@
scm:
- gerrit-trigger-scm:
- refspec: ''
- choosing-strategy: 'default'
+ refspec: '$GERRIT_REFSPEC'
+ choosing-strategy: 'gerrit'
submodule-recursive: '{submodule-recursive}'
wrappers:
diff --git a/jjb/lab/include-raw-lab-retrieve-logs.sh b/jjb/lab/include-raw-lab-retrieve-logs.sh
index 6335e49..9b0b00c 100644
--- a/jjb/lab/include-raw-lab-retrieve-logs.sh
+++ b/jjb/lab/include-raw-lab-retrieve-logs.sh
@@ -5,5 +5,11 @@
echo Retriving logs from $LOG_DIR_URL
rm -rf archives
+mkdir -p archives
+curl -f "$SRC_BUILD_URL/timestamps/?time=HH:mm:ssZ&appendLog" > archives/console-source-timestamp.log
wget -r -nv -nd --no-parent -l 1 --reject="index.html*" -P archives "$LOG_DIR_URL"
-cat archives/console.log
+if [ -s archives/console-source-timestamp.log ]; then
+ cat archives/console-source-timestamp.log
+else
+ cat archives/console.log
+fi
diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml
index 9fbcaef..1318003 100644
--- a/jjb/logging-analytics/logging-analytics.yaml
+++ b/jjb/logging-analytics/logging-analytics.yaml
@@ -10,6 +10,7 @@
- '{project-name}-{stream}-docker-version-java-daily':
docker-pom: 'pom.xml'
mvn-profile: 'docker'
+ mvn-params: '-Dmaven.test.skip=true'
project: 'logging-analytics'
stream:
- 'master':
diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml
index 40db4d1..53350d0 100644
--- a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml
+++ b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml
@@ -23,6 +23,7 @@
setVersion: 'DontSetVersion'
docker-pom: 'javatoscachecker/pom.xml'
mvn-profile: 'docker'
+ mvn-params: '-Dmaven.test.skip=true'
maven-properties: |
skip.docker.build=false
skip.docker.tag=false
diff --git a/jjb/music/music-jar.yaml b/jjb/music/music-jar.yaml
index dba2ab2..86fcf13 100644
--- a/jjb/music/music-jar.yaml
+++ b/jjb/music/music-jar.yaml
@@ -13,7 +13,7 @@
- '{project-name}-{stream}-{subproject}-merge-java'
project: 'music'
stream:
- - 'release-2.5.3':
+ - 'jar-release-2.5.3':
branch: 'release-2.5.3'
mvn-settings: 'music-settings'
files: '**'
diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml
index 0866f06..b4b879d 100644
--- a/jjb/music/music.yaml
+++ b/jjb/music/music.yaml
@@ -10,10 +10,13 @@
- '{project-name}-{stream}-docker-version-java-daily':
docker-pom: 'pom.xml'
mvn-profile: docker
+ mvn-params: '-Dmaven.test.skip=true'
project: 'music'
stream:
- 'master':
branch: 'master'
+ - 'release-2.5.3':
+ branch: 'master'
mvn-settings: 'music-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml
index ddbccf6..c07a769 100644
--- a/jjb/optf/optf-has.yaml
+++ b/jjb/optf/optf-has.yaml
@@ -6,6 +6,8 @@
stream:
- 'master':
branch: 'master'
+ - 'release-1.1.1':
+ branch: 'master'
mvn-settings: 'optf-has-settings'
subproject:
- 'conductor':
diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml
index c93cccf..3f575ce 100644
--- a/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@ -6,6 +6,8 @@
stream:
- 'master':
branch: 'master'
+ - 'release-1.1.1':
+ branch: 'master'
mvn-settings: 'optf-osdf-settings'
subproject:
- 'osdf':
diff --git a/jjb/portal/portal-docker.yaml b/jjb/portal/portal-docker.yaml
index 71edff8..d275d65 100644
--- a/jjb/portal/portal-docker.yaml
+++ b/jjb/portal/portal-docker.yaml
@@ -17,8 +17,8 @@
stream:
- 'master':
branch: 'master'
- - 'release-1.3.0':
- branch: 'release-1.3.0'
+ - 'release-2.2.0':
+ branch: 'release-2.2.0'
mvn-settings: 'portal-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml
index 9a04c1e..4f8eb84 100644
--- a/jjb/portal/portal.yaml
+++ b/jjb/portal/portal.yaml
@@ -9,8 +9,8 @@
stream:
- 'master':
branch: 'master'
- - 'release-1.3.0':
- branch: 'release-1.3.0'
+ - 'release-2.2.0':
+ branch: 'release-2.2.0'
mvn-settings: 'portal-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/sdc/sdc-dcae-d-ci.yaml b/jjb/sdc/sdc-dcae-d-ci.yaml
new file mode 100644
index 0000000..f5e230c
--- /dev/null
+++ b/jjb/sdc/sdc-dcae-d-ci.yaml
@@ -0,0 +1,30 @@
+---
+- project:
+ name: sdc-dcae-d-ci
+ project-name: 'sdc-dcae-d-ci'
+ jobs:
+ - gerrit-maven-clm
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-release-version-java-daily'
+ - '{project-name}-{stream}-merge-java'
+ project: 'sdc/dcae-d/ci'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'sdc-dcae-d-ci-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-timeout: 60
+
+- project:
+ name: sdc-dcae-ci-sonar
+ jobs:
+ - gerrit-maven-sonar
+ cron: 'H 11 * * *'
+ build-node: ubuntu1604-builder-4c-4g
+ project: 'sdc/dcae-d/ci'
+ project-name: 'sdc-dcae-d-ci'
+ branch: 'master'
+ mvn-settings: 'sdc-dcae-d-ci-settings'
+ mvn-goals: 'clean install'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
new file mode 100644
index 0000000..d2f6233
--- /dev/null
+++ b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
@@ -0,0 +1,34 @@
+---
+- project:
+ name: sdc-dcae-d-dt-be-main
+ project-name: 'sdc-dcae-d-dt-be-main'
+ jobs:
+ - gerrit-maven-clm
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-release-version-java-daily'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-docker-version-java-daily':
+ docker-pom: 'pom.xml'
+ mvn-profile: 'docker'
+ mvn-params: '-DskipTests=true'
+ project: 'sdc/dcae-d/dt-be-main'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-timeout: 60
+
+- project:
+ name: sdc-dcae-d-dt-be-main-sonar
+ jobs:
+ - gerrit-maven-sonar
+ cron: 'H 11 * * *'
+ build-node: ubuntu1604-builder-4c-4g
+ project: 'sdc/dcae-d/dt-be-main'
+ project-name: 'sdc-dcae-d-dt-be-main'
+ branch: 'master'
+ mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
+ mvn-goals: 'clean install'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml
new file mode 100644
index 0000000..e1c63c2
--- /dev/null
+++ b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml
@@ -0,0 +1,30 @@
+---
+- project:
+ name: sdc-dcae-d-dt-be-property
+ project-name: 'sdc-dcae-d-dt-be-property'
+ jobs:
+ - gerrit-maven-clm
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-release-version-java-daily'
+ - '{project-name}-{stream}-merge-java'
+ project: 'sdc/dcae-d/dt-be-property'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'sdc-dcae-d-dt-be-property-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-timeout: 60
+
+- project:
+ name: sdc-dcae-d-dt-be-property-sonar
+ jobs:
+ - gerrit-maven-sonar
+ cron: 'H 11 * * *'
+ build-node: ubuntu1604-builder-4c-4g
+ project: 'sdc/dcae-d/dt-be-property'
+ project-name: 'sdc-dcae-d-dt-be-property'
+ branch: 'master'
+ mvn-settings: 'sdc-dcae-d-dt-be-property-settings'
+ mvn-goals: 'clean install'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml
new file mode 100644
index 0000000..4b13a9e
--- /dev/null
+++ b/jjb/sdc/sdc-dcae-d-fe.yaml
@@ -0,0 +1,35 @@
+---
+- project:
+ name: sdc-dcae-d-fe
+ project-name: 'sdc-dcae-d-fe'
+ build-node: ubuntu1604-builder-4c-2g
+ jobs:
+ - gerrit-maven-clm
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-release-version-java-daily'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-docker-version-java-daily':
+ docker-pom: 'pom.xml'
+ mvn-profile: 'docker'
+ mvn-params: '-DskipTests=true'
+ project: 'sdc/dcae-d/fe'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'sdc-dcae-d-fe-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-timeout: 60
+
+- project:
+ name: sdc-dcae-d-fe-sonar
+ jobs:
+ - gerrit-maven-sonar
+ cron: 'H 11 * * *'
+ build-node: ubuntu1604-builder-4c-4g
+ project: 'sdc/dcae-d/fe'
+ project-name: 'sdc-dcae-d-fe'
+ branch: 'master'
+ mvn-settings: 'sdc-dcae-d-fe-settings'
+ mvn-goals: 'clean install'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index 04a0c2d..35ee0a7 100644
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -7,7 +7,8 @@
- '{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-java-daily':
+ mvn-params: '-Dmaven.test.skip=true'
project: 'sdc/sdc-workflow-designer'
stream:
- 'master':
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 4b63bde..2535ee0 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -12,6 +12,7 @@
- '{project-name}-{stream}-docker-version-java-daily':
docker-pom: 'pom.xml'
mvn-profile: 'docker'
+ mvn-params: '-DskipTests=true'
- gerrit-maven-clm
project: 'sdc'
stream:
@@ -31,5 +32,6 @@
project-name: 'sdc'
branch: 'master'
mvn-settings: 'sdc-settings'
- mvn-goals: 'clean install -Djacoco.skip=false'
+ mvn-params: '-Djacoco.skip=false'
+ mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 476707f..4715204 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -11,7 +11,7 @@
- '{project-name}-{stream}-docker-java-daily':
docker-pom: 'pom.xml'
mvn-profile: 'docker'
-
+ mvn-params: '-Dmaven.test.skip=true'
project: 'sdnc/oam'
stream:
- 'master':
diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 3e8efc7..99db60f 100644
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -19,6 +19,7 @@
- '{project-name}-{stream}-docker-version-java-daily':
docker-pom: 'pom.xml'
mvn-profile: 'docker'
+ mvn-params: '-Dmaven.test.skip=true'
project: 'so'
stream:
- 'master':
diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml
index c0bb0f3..86df049 100644
--- a/jjb/usecaseui/usecase-ui-server.yaml
+++ b/jjb/usecaseui/usecase-ui-server.yaml
@@ -13,7 +13,8 @@
- '{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-java-daily':
+ mvn-params: '-Dmaven.test.skip=true'
files: '**'
archive-artifacts: ''
docker-pom: 'pom.xml'
diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml
index 4290395..6854d87 100644
--- a/jjb/usecaseui/usecase-ui.yaml
+++ b/jjb/usecaseui/usecase-ui.yaml
@@ -13,7 +13,8 @@
- '{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-java-daily':
+ mvn-params: '-Dmaven.test.skip=true'
files: '**'
archive-artifacts: ''
docker-pom: 'pom.xml'
diff --git a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh
index d729cb1..63ed409 100755
--- a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh
+++ b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh
@@ -17,7 +17,3 @@
chmod 755 ./nokia/vnfmdriver/vfcadaptorservice/docker/*.*
./nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh
-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/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
index dbfdd39..3c8ada8 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
@@ -1,8 +1,8 @@
---
- project:
name: vfc-nfvo-driver-vnfm-svnfm-nokiav2
- project-name: 'vfc-nfvo-driver-svnfm-nokiav2'
project: 'vfc/nfvo/driver/vnfm/svnfm'
+ project-name: 'vfc-nfvo-driver-svnfm-nokiav2'
stream:
- 'master':
branch: 'master'
@@ -17,19 +17,46 @@
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-version-java-daily'
- files: '**'
+ files: 'nokiav2/**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
+
+- project:
+ name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-docker
+ project: 'vfc/nfvo/driver/vnfm/svnfm'
+ project-name: 'vfc-nfvo-driver-svnfm-nokiav2'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
+ subproject:
+ - 'docker-vnfm-nokiav2':
+ pom: 'nokiav2/pom.xml'
+ pattern: 'nokiav2/**'
+ jobs:
+ - '{project-name}-{subproject}-{stream}-merge-docker':
+ docker_build_args: '--build-arg MODE=-SNAPSHOT --build-arg REPO=snapshots'
+ docker_name: 'onap/vfc/nfvo/svnfm/nokiav2'
+ docker_root: '$WORKSPACE/nokiav2/deployment'
+ - '{project-name}-{subproject}-{stream}-release-version-docker-daily-no-sonar':
+ docker_build_args: '--build-arg MODE= --build-arg REPO=staging'
+ docker_name: 'onap/vfc/nfvo/svnfm/nokiav2'
+ docker_root: '$WORKSPACE/nokiav2/deployment'
+ docker_registry: '$DOCKER_REGISTRY:10003'
+ files: 'nokiav2/**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-docker-8c-8g
+
- project:
name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-sonar
- jobs:
- - gerrit-maven-sonar
- cron: 'H 11 * * *'
- mvn-params: '-f nokiav2/pom.xml'
- build-node: ubuntu1604-builder-4c-4g
project: 'vfc/nfvo/driver/vnfm/svnfm'
project-name: 'vfc-nfvo-driver-vnfm-svnfm-nokiav2'
+ cron: 'H 11 * * *'
branch: 'master'
+ mvn-params: '-f nokiav2/pom.xml'
mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ jobs:
+ - gerrit-maven-sonar
+ build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml
index 06e1325..0591b95 100644
--- a/jjb/vid/vid.yaml
+++ b/jjb/vid/vid.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':
+ mvn-params: '-Dmaven.test.skip=true'
- '{project-name}-{stream}-docker-version-java-daily':
docker-pom: 'pom.xml'
mvn-profile: 'docker'
diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
index 2019e1c..9a736da 100644
--- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
@@ -25,6 +25,7 @@
- '{project-name}-{stream}-docker-java-daily':
docker-pom: 'pom.xml'
mvn-profile: 'docker'
+ mvn-params: '-Dmaven.test.skip=true'
- project:
name: vnfsdk-dovetail-integration-tox-sonar
jobs:
diff --git a/jjb/vnfsdk/vnfsdk-ice-python.yaml b/jjb/vnfsdk/vnfsdk-ice-python.yaml
index 063c780..a3ad7d3 100644
--- a/jjb/vnfsdk/vnfsdk-ice-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-ice-python.yaml
@@ -49,6 +49,7 @@
- '{project-name}-{stream}-docker-version-java-daily':
docker-pom: 'docker/pom.xml'
mvn-profile: 'docker'
+ mvn-params: '-Dmaven.test.skip=true'
- project:
name: vnfsdk-ice-validation-scripts-tox-sonar
jobs:
diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
index 30c3e07..0b07b10 100644
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -14,6 +14,7 @@
- '{project-name}-{stream}-docker-version-java-daily':
docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml'
mvn-profile: 'docker'
+ mvn-params: '-Dmaven.test.skip=true'
project: 'vnfsdk/refrepo'
stream:
diff --git a/jjb/vvp/vvp-cms.yaml b/jjb/vvp/vvp-cms.yaml
index 903df18..bc73a23 100644
--- a/jjb/vvp/vvp-cms.yaml
+++ b/jjb/vvp/vvp-cms.yaml
@@ -16,7 +16,8 @@
jobs:
- gerrit-python-xc-clm
- '{project-name}-{stream}-{subproject}-verify-python'
- - '{project-name}-{stream}-docker-java-daily'
+ - '{project-name}-{stream}-docker-java-daily':
+ mvn-params: '-Dmaven.test.skip=true'
docker-pom: 'pom.xml'
mvn-profile: 'default'
- project:
diff --git a/jjb/vvp/vvp-engagementmgr.yaml b/jjb/vvp/vvp-engagementmgr.yaml
index 4516970..c1b4404 100644
--- a/jjb/vvp/vvp-engagementmgr.yaml
+++ b/jjb/vvp/vvp-engagementmgr.yaml
@@ -16,7 +16,8 @@
jobs:
- gerrit-python-xc-clm
- '{project-name}-{stream}-{subproject}-verify-python'
- - '{project-name}-{stream}-docker-java-daily'
+ - '{project-name}-{stream}-docker-java-daily':
+ mvn-params: '-Dmaven.test.skip=true'
docker-pom: 'pom.xml'
mvn-profile: 'default'
- project:
diff --git a/jjb/vvp/vvp-gitlab.yaml b/jjb/vvp/vvp-gitlab.yaml
index c5b182b..3613edc 100644
--- a/jjb/vvp/vvp-gitlab.yaml
+++ b/jjb/vvp/vvp-gitlab.yaml
@@ -16,7 +16,8 @@
jobs:
- gerrit-python-xc-clm
- '{project-name}-{stream}-{subproject}-verify-python'
- - '{project-name}-{stream}-docker-java-daily'
+ - '{project-name}-{stream}-docker-java-daily':
+ mvn-params: '-Dmaven.test.skip=true'
docker-pom: 'pom.xml'
mvn-profile: 'default'
- project:
diff --git a/jjb/vvp/vvp-image-scanner.yaml b/jjb/vvp/vvp-image-scanner.yaml
index 0fd2112..f29f877 100644
--- a/jjb/vvp/vvp-image-scanner.yaml
+++ b/jjb/vvp/vvp-image-scanner.yaml
@@ -16,7 +16,8 @@
jobs:
- gerrit-python-xc-clm
- '{project-name}-{stream}-{subproject}-verify-python'
- - '{project-name}-{stream}-docker-java-daily'
+ - '{project-name}-{stream}-docker-java-daily':
+ mvn-params: '-Dmaven.test.skip=true'
docker-pom: 'pom.xml'
mvn-profile: 'default'
- project:
diff --git a/jjb/vvp/vvp-jenkins.yaml b/jjb/vvp/vvp-jenkins.yaml
index b78e0d2..77c8a72 100644
--- a/jjb/vvp/vvp-jenkins.yaml
+++ b/jjb/vvp/vvp-jenkins.yaml
@@ -16,7 +16,8 @@
jobs:
- gerrit-python-xc-clm:
- '{project-name}-{stream}-{subproject}-verify-python'
- - '{project-name}-{stream}-docker-java-daily'
+ - '{project-name}-{stream}-docker-java-daily':
+ mvn-params: '-Dmaven.test.skip=true'
docker-pom: 'pom.xml'
mvn-profile: 'default'
- project:
diff --git a/jjb/vvp/vvp-portal.yaml b/jjb/vvp/vvp-portal.yaml
index f037336..d62bd85 100644
--- a/jjb/vvp/vvp-portal.yaml
+++ b/jjb/vvp/vvp-portal.yaml
@@ -16,7 +16,8 @@
jobs:
- gerrit-python-xc-clm
- '{project-name}-{stream}-{subproject}-verify-python'
- - '{project-name}-{stream}-docker-java-daily'
+ - '{project-name}-{stream}-docker-java-daily':
+ mvn-params: '-Dmaven.test.skip=true'
docker-pom: 'pom.xml'
mvn-profile: 'default'
- project:
diff --git a/jjb/vvp/vvp-postgresql.yaml b/jjb/vvp/vvp-postgresql.yaml
index af94edf..c3a0f31 100644
--- a/jjb/vvp/vvp-postgresql.yaml
+++ b/jjb/vvp/vvp-postgresql.yaml
@@ -16,7 +16,8 @@
jobs:
- gerrit-python-xc-clm
- '{project-name}-{stream}-{subproject}-verify-python'
- - '{project-name}-{stream}-docker-java-daily'
+ - '{project-name}-{stream}-docker-java-daily':
+ mvn-params: '-Dmaven.test.skip=true'
docker-pom: 'pom.xml'
mvn-profile: 'default'
- project:
diff --git a/jjb/vvp/vvp-test-engine.yaml b/jjb/vvp/vvp-test-engine.yaml
index 85287cd..b4ccbd8 100644
--- a/jjb/vvp/vvp-test-engine.yaml
+++ b/jjb/vvp/vvp-test-engine.yaml
@@ -16,7 +16,8 @@
jobs:
- gerrit-python-xc-clm
- '{project-name}-{stream}-{subproject}-verify-python'
- - '{project-name}-{stream}-docker-java-daily'
+ - '{project-name}-{stream}-docker-java-daily':
+ mvn-params: '-Dmaven.test.skip=true'
docker-pom: 'pom.xml'
mvn-profile: 'default'
- project:
diff --git a/shell/docker-build.sh b/shell/docker-build.sh
index 7990784..1cb71d3 100644
--- a/shell/docker-build.sh
+++ b/shell/docker-build.sh
@@ -6,12 +6,16 @@
FULL_DATE=`date +'%Y%m%dT%H%M%S'`
IMAGE_VERSION=`xmlstarlet sel -N "x=http://maven.apache.org/POM/4.0.0" -t -v "/x:project/x:version" pom.xml | cut -c1-5`
-case "$DOCKERREGISTRY" in
- "$DOCKER_REGISTRY:10004") DOCKER_TAG="$IMAGE_VERSION"-STAGING-"$FULL_DATE"Z
- echo "Using tag $DOCKER_TAG"
+case "$BUILD_MODE" in
+ "STAGING")
+ DOCKER_TAG="$IMAGE_VERSION"-STAGING-"$FULL_DATE"Z
+ DOCKER_LATEST_TAG="$IMAGE_VERSION"-STAGING-latest
+ echo "Using tags $DOCKER_TAG and $DOCKER_LATEST_TAG"
;;
- "$DOCKER_REGISTRY:10003") DOCKER_TAG="$IMAGE_VERSION"-SNAPSHOT-"$FULL_DATE"Z
- echo "Using tag $DOCKER_TAG"
+ "SNAPSHOT")
+ DOCKER_TAG="$IMAGE_VERSION"-SNAPSHOT-"$FULL_DATE"Z
+ DOCKER_LATEST_TAG="$IMAGE_VERSION"-SNAPSHOT-latest
+ echo "Using tags $DOCKER_TAG and $DOCKER_LATEST_TAG"
;;
esac
@@ -21,14 +25,17 @@
# DOCKERREGISTRY is purposely not using an '_' so as to not conflict with the
# Jenkins global env var of the DOCKER_REGISTRY which the docker-login step uses
IMAGE_NAME="$DOCKERREGISTRY/$DOCKER_NAME:$DOCKER_TAG"
+IMAGE_NAME_LATEST="$DOCKERREGISTRY/$DOCKER_NAME:$DOCKER_LATEST_TAG"
# Build the docker image
# Allow word splitting
# shellcheck disable=SC2086
-docker build $DOCKER_ARGS . -t $IMAGE_NAME | tee "$WORKSPACE/docker_build_log.txt"
+docker build $DOCKER_ARGS . -t $IMAGE_NAME -t $IMAGE_NAME_LATEST | tee "$WORKSPACE/docker_build_log.txt"
# Write DOCKER_IMAGE information to a file so it can be injected into the
# environment for following steps
echo "DOCKER_IMAGE=$IMAGE_NAME" >> "$WORKSPACE/env_inject.txt"
+echo "DOCKER_IMAGE_LATEST=$IMAGE_NAME_LATEST" >> "$WORKSPACE/env_inject.txt"
+
diff --git a/shell/docker-push.sh b/shell/docker-push.sh
index 68b2bdb..937a01a 100644
--- a/shell/docker-push.sh
+++ b/shell/docker-push.sh
@@ -4,3 +4,4 @@
# Push our image to wherever it's defined to go by the name
docker push "$DOCKER_IMAGE"
+docker push "$DOCKER_IMAGE_LATEST"