Merge "Enable jjb-verify check of build node labels"
diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml
index b148414..67b3f67 100644
--- a/jjb/clamp/clamp.yaml
+++ b/jjb/clamp/clamp.yaml
@@ -31,6 +31,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
- 'elalto':
branch: 'elalto'
mvn-settings: 'clamp-settings'
diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
index 4c626e9..0737cbd 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
@@ -6,6 +6,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
# apply to all jobs
project: 'dcaegen2/analytics/tca-gen2'
mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
index bcb4f91..e0e4c05 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
@@ -7,6 +7,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
# apply to all jobs
project: 'dcaegen2/analytics/tca'
mvn-settings: 'dcaegen2-analytics-tca-settings'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
index 3231fae..3f4f911 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
@@ -6,6 +6,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
# apply to all jobs
project: 'dcaegen2/collectors/datafile'
mvn-settings: 'dcaegen2-collectors-datafile-settings'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index d6f7b87..3ab5a74 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
@@ -7,6 +7,9 @@
- 'master':
branch: 'master'
java-version: openjdk11
+ - 'frankfurt':
+ branch: 'frankfurt'
+ java-version: openjdk11
# apply to all jobs
project: 'dcaegen2/collectors/hv-ves'
mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
index e06ca9e..7c72a16 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
@@ -21,6 +21,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-collectors-restconf-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index a586372..c2d604a 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -13,6 +13,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index eba5e39..8896237 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -22,6 +22,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-collectors-ves-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml
index e1eda94..c5b80e4 100644
--- a/jjb/dcaegen2/dcaegen2-deployments.yaml
+++ b/jjb/dcaegen2/dcaegen2-deployments.yaml
@@ -12,6 +12,10 @@
stream:
- 'master':
branch: 'master'
+ - 'elalto':
+ branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-deployments-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
index 8ea96a6..7d57150 100644
--- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
@@ -12,6 +12,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-platform-blueprints-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
index 2203fe7..61c27fc 100644
--- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
@@ -28,6 +28,8 @@
stream:
- master:
branch: master
+ - frankfurt:
+ branch: frankfurt
- project:
name: dcaegen2-platform-configbinding-sonar
diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
index fdc6fa4..0aaf8c9 100644
--- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
@@ -12,6 +12,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-platform-deployment-handler-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
index 44c5bf7..1268c50 100644
--- a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
@@ -98,6 +98,8 @@
stream:
- master:
branch: master
+ - frankfurt:
+ branch: frankfurt
views:
- project-view:
project-name: dcaegen2-platform-adapter
diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
index f368dae..3813968 100644
--- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
@@ -21,6 +21,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-platform-inventory-api-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
index dc48e74..de506f8 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
@@ -22,6 +22,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-platform-settings'
maven-deploy-properties: |
deployAtEnd=true
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
index e84e83e..5a8a623 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
@@ -15,6 +15,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: dcaegen2-platform-settings
files: '**'
archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
index dea3938..73ffe09 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
@@ -15,6 +15,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: dcaegen2-platform-settings
files: '**'
archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
index 3e5a85c..abea091 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
@@ -15,6 +15,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: dcaegen2-platform-settings
files: '**'
archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
index 31d7d11..af7d874 100644
--- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
@@ -11,6 +11,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-platform-plugins-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
index 9ff0471..07722a5 100644
--- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
@@ -12,6 +12,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-platform-policy-handler-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
index a456b4f..4f5f997 100644
--- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
@@ -21,7 +21,8 @@
stream:
- 'master':
branch: 'master'
-
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-platform-servicechange-handler-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
index f3dd22f..776eea2 100644
--- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
@@ -5,6 +5,8 @@
project-name: 'dcaegen2-services'
jobs:
- '{project-name}-{stream}-{subproject}-verify-java'
+ - '{project-name}-{stream}-{subproject}-merge-java':
+ mvn-goals: 'clean install'
subproject:
- 'bbs-event-processor':
pom: 'components/bbs-event-processor/pom.xml'
@@ -13,6 +15,9 @@
- 'master':
branch: 'master'
java-version: openjdk11
+ - 'frankfurt':
+ branch: 'frankfurt'
+ java-version: openjdk11
mvn-settings: 'dcaegen2-services-settings'
maven-version: 'mvn35'
maven-deploy-properties: |
@@ -22,26 +27,6 @@
build-node: 'ubuntu1804-docker-8c-8g'
- project:
- name: dcaegen2-services-bbs-event-processor-merge
- project: 'dcaegen2/services'
- project-name: 'dcaegen2-services-bbs-event-processor'
- jobs:
- - gerrit-maven-merge:
- mvn-params: '-f components/bbs-event-processor/pom.xml'
- mvn-goals: 'clean install -Dmaven.deploy.skip=true'
- branch: 'master'
- java-version: openjdk11
- mvn-settings: 'dcaegen2-services-settings'
- maven-version: 'mvn35'
- maven-deploy-properties: |
- deployAtEnd=false
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1804-docker-8c-8g'
- mvn-snapshot-id: 'ecomp-snapshots'
- nexus-snapshot-repo: 'snapshots'
-
-- project:
name: dcaegen2-services-bbs-event-processor-release
project: 'dcaegen2/services'
project-name: 'dcaegen2-services-bbs-event-processor'
diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
index 017eb64..468b07a 100644
--- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
@@ -13,6 +13,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-services-settings'
maven-deploy-properties: |
deployAtEnd=true
@@ -42,6 +44,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-services-settings'
maven-deploy-properties: |
deployAtEnd=true
@@ -71,6 +75,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-services-settings'
maven-deploy-properties: |
deployAtEnd=true
diff --git a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
index 1c2dd59..3c2c28c 100644
--- a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
@@ -91,6 +91,8 @@
stream:
- master:
branch: master
+ - frankfurt:
+ branch: frankfurt
views:
- project-view:
project-name: dcaegen2-services-pmsh
diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
index 7a23af1..47fa28b 100644
--- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
@@ -13,6 +13,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
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
diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
index 6e0fe73..6690f20 100644
--- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
@@ -21,6 +21,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-services-mapper-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
index f486b95..2791c37 100644
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
@@ -6,6 +6,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
# apply to all jobs
project: 'dcaegen2/services/pm-mapper'
mvn-settings: 'dcaegen2-services-pm-mapper-settings'
diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml
index c2672c1..051c958 100644
--- a/jjb/dcaegen2/dcaegen2-services-prh.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml
@@ -21,6 +21,9 @@
- 'master':
branch: 'master'
java-version: openjdk11
+ - 'frankfurt':
+ branch: 'frankfurt'
+ java-version: openjdk11
mvn-settings: 'dcaegen2-services-prh-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
index 377a276..d8500b8 100644
--- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
@@ -17,6 +17,9 @@
- 'master':
branch: 'master'
java-version: openjdk11
+ - 'frankfurt':
+ branch: 'frankfurt'
+ java-version: openjdk11
mvn-settings: 'dcaegen2-services-sdk-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
index a969c81..d536d1a 100644
--- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
@@ -21,6 +21,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-services-son-handler-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index 2603a69..f0f2c74 100644
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -13,6 +13,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'dcaegen2-utils-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml
index b30af0e..6480daa 100644
--- a/jjb/global-templates-python.yaml
+++ b/jjb/global-templates-python.yaml
@@ -99,27 +99,11 @@
artifacts: '{archive-artifacts}'
- maven-exec:
maven-version: '{maven-version}'
-
scm:
- gerrit-trigger-scm:
refspec: ''
choosing-strategy: 'default'
submodule-recursive: '{submodule-recursive}'
- - git-extra-project:
- project: '{extra-project1}'
- refspec: '{extra-refspec1}'
- branch: '{extra-branch1}'
- checkout-dir: '{checkout-dir1}'
- - git-extra-project:
- project: '{extra-project2}'
- refspec: '{extra-refspec2}'
- branch: '{extra-branch2}'
- checkout-dir: '{checkout-dir2}'
- - git-extra-project:
- project: '{extra-project3}'
- refspec: '{extra-refspec3}'
- branch: '{extra-branch3}'
- checkout-dir: '{checkout-dir3}'
wrappers:
- infra-wrappers-docker-build:
diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml
index 81ef487..831c770 100644
--- a/jjb/global-templates-script.yaml
+++ b/jjb/global-templates-script.yaml
@@ -18,6 +18,7 @@
name: '{project-name}-{stream}-{area}-verify-shell'
node: '{build-node}'
type: freestyle
+ concurrent: true
pattern: '**'
diff --git a/jjb/include-raw-deploy-archives.sh b/jjb/include-raw-deploy-archives.sh
deleted file mode 100644
index 4d0945a..0000000
--- a/jjb/include-raw-deploy-archives.sh
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/bin/bash
-
-set +e # Do not affect the build result if some part of archiving fails.
-
-# Print out git status at the end of the build before we archive if $WORKSPACE
-# is a git repo.
-if [ -d "$WORKSPACE/.git" ]; then
- echo ""
- echo "----------> Git Status Report"
- git status
-fi
-
-echo ""
-echo "----------> Archiving build to logs server"
-# Configure wget to not print download status when we download logs or when
-# Jenkins is installing Maven (To be clear this is the Jenkins Maven plugin
-# using a shell script itself that we are unable to modify directly to affect
-# wget).
-echo "verbose=off" > ~/.wgetrc
-
-ARCHIVES_DIR="$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER"
-[ "$LOGS_SERVER" ] || LOGS_SERVER="https://logs.onap.org"
-[ "$LOGS_REPO_URL" ] || LOGS_REPO_URL="https://nexus.onap.org/service/local/repositories/logs"
-
-echo "Build logs: <a href=\"$LOGS_SERVER/$SILO/$ARCHIVES_DIR\">$LOGS_SERVER/$SILO/$ARCHIVES_DIR</a>"
-
-mkdir .archives
-cd .archives/ || exit 1
-
-cat > deploy-archives.xml <<EOF
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>logs</groupId>
- <artifactId>logs</artifactId>
- <version>1.0.0</version>
- <packaging>pom</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>maven-upload-plugin</artifactId>
- <version>0.0.1</version>
- <executions>
- <execution>
- <id>publish-site</id>
- <phase>deploy</phase>
- <goals>
- <goal>upload-file</goal>
- </goals>
- <configuration>
- <serverId>onap-log-archives</serverId>
- <repositoryUrl>$LOGS_REPO_URL/content-compressed</repositoryUrl>
- <file>archives.zip</file>
- <repositoryPath>$SILO</repositoryPath>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
-EOF
-
-mkdir -p "$ARCHIVES_DIR"
-mkdir -p "$WORKSPACE/archives"
-if [ ! -z "$ARCHIVE_ARTIFACTS" ]; then
- pushd "$WORKSPACE"
- shopt -s globstar # Enable globstar to copy archives
- for f in $ARCHIVE_ARTIFACTS; do
- [[ -e $f ]] || continue # handle the case of no files to archive
- echo "Archiving $f" >> "$WORKSPACE/.archives/$ARCHIVES_DIR/_archives.log"
- dir=$(dirname "$f")
- mkdir -p "$WORKSPACE/archives/$dir"
- mv "$f" "$WORKSPACE/archives/$f"
- done
- shopt -u globstar # Disable globstar once archives are copied
- popd
-fi
-
-
-# Ignore logging if archives doesn't exist
-mv "$WORKSPACE/archives/" "$ARCHIVES_DIR" > /dev/null 2>&1
-touch "$ARCHIVES_DIR/_build-details.txt"
-echo "build-url: ${BUILD_URL}" >> "$ARCHIVES_DIR/_build-details.txt"
-env | grep -v PASSWORD > "$ARCHIVES_DIR/_build-enviroment-variables.txt"
-
-# capture system info
-touch "$ARCHIVES_DIR/_sys-info.txt"
-{
- echo -e "uname -a:\n $(uname -a) \n"
- echo -e "df -h:\n $(df -h) \n"
- echo -e "free -m:\n $(free -m) \n"
- echo -e "nproc:\n $(nproc) \n"
- echo -e "lscpu:\n $(lscpu) \n"
- echo -e "ip addr:\n $(/sbin/ip addr) \n"
-} 2>&1 | tee -a "$ARCHIVES_DIR/_sys-info.txt"
-
-# Magic string used to trim console logs at the appropriate level during wget
-echo "-----END_OF_BUILD-----"
-wget -O "$ARCHIVES_DIR/console.log" "${BUILD_URL}consoleText"
-wget -O "$ARCHIVES_DIR/console-timestamp.log" "$BUILD_URL/timestamps?time=HH:mm:ss&appendLog"
-sed -i '/^-----END_OF_BUILD-----$/,$d' "$ARCHIVES_DIR/console.log"
-sed -i '/^.*-----END_OF_BUILD-----$/,$d' "$ARCHIVES_DIR/console-timestamp.log"
-
-gzip "$ARCHIVES_DIR"/*.txt "$ARCHIVES_DIR"/*.log
-# find and gzip any 'text' files
-find "$ARCHIVES_DIR" -type f -print0 \
- | xargs -0r file \
- | egrep -e ':.*text.*' \
- | cut -d: -f1 \
- | xargs -d'\n' -r gzip
-# Compress Java heap dumps using xz
-find "$ARCHIVES_DIR" -type f -name \*.hprof -print0 | xargs -0 xz
-
-zip -r archives.zip "$JENKINS_HOSTNAME/" >> "$ARCHIVES_DIR/_archives.log"
-du -sh archives.zip
diff --git a/jjb/include-update-pom-versions-not-parent.sh b/jjb/include-update-pom-versions-not-parent.sh
deleted file mode 100644
index ace2350..0000000
--- a/jjb/include-update-pom-versions-not-parent.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-## Will update POM in workspace with release version
-
-if [ ! -e version.properties ]; then
- echo "Missing version.properties"
- exit 1
-fi
-
-## will setup variable release_version
-source ./version.properties
-
-RELEASE_VERSION=$release_version
-
-echo Changing POM version to $RELEASE_VERSION
-
-## handle POM
-for file in $(find . -name pom.xml); do
- VERSION=$(xpath -q -e '//project/version/text()' $file)
- PVERSION=$(xpath -q -e '//project/parent/version/text()' $file)
- echo before changes VERSION=$VERSION PVERSION=$PVERSION file=$file
- if [ "$VERSION" != "" ]; then
- awk -v v=$RELEASE_VERSION '
- /<version>/ {
- if (! done) {
- sub(/<version>.*</,"<version>" v "<",$0)
- done = 1
- }
- }
- { print $0 }
- ' $file > $file.tmp
- mv $file.tmp $file
- fi
- VERSION=$(xpath -q -e '//project/version/text()' $file)
- PVERSION=$(xpath -q -e '//project/parent/version/text()' $file)
- echo after changes VERSION=$VERSION PVERSION=$PVERSION file=$file
-done
-
diff --git a/jjb/include-update-pom-versions.sh b/jjb/include-update-pom-versions.sh
deleted file mode 100644
index 2d459d0..0000000
--- a/jjb/include-update-pom-versions.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-## Will update POM in workspace with release version
-
-if [ ! -e version.properties ]; then
- echo "Missing version.properties"
- exit 1
-fi
-
-## will setup variable release_version
-source ./version.properties
-
-RELEASE_VERSION=$release_version
-
-echo Changing POM version to $RELEASE_VERSION
-
-## handle POM
-for file in $(find . -name pom.xml); do
- VERSION=$(xpath -q -e '//project/version/text()' $file)
- PVERSION=$(xpath -q -e '//project/parent/version/text()' $file)
- echo before changes VERSION=$VERSION PVERSION=$PVERSION file=$file
- if [ "$VERSION" != "" ]; then
- awk -v v=$RELEASE_VERSION '
- /<version>/ {
- if (! done) {
- sub(/<version>.*</,"<version>" v "<",$0)
- done = 1
- }
- }
- { print $0 }
- ' $file > $file.tmp
- mv $file.tmp $file
- fi
- if [ "$PVERSION" != "" ]; then
- awk -v v=$RELEASE_VERSION '
- /<version>/ {
- if (parent && ! done) {
- sub(/<version>.*</,"<version>" v "<",$0)
- done = 1
- }
- }
- /<parent>/ { parent = 1 }
- { print $0 }
- ' $file > $file.tmp
- mv $file.tmp $file
- fi
- VERSION=$(xpath -q -e '//project/version/text()' $file)
- PVERSION=$(xpath -q -e '//project/parent/version/text()' $file)
- echo after changes VERSION=$VERSION PVERSION=$PVERSION file=$file
-done
-
diff --git a/jjb/integration/docker/integration-docker-onap-java11.yaml b/jjb/integration/docker/integration-docker-onap-java11.yaml
index 512acc1..4ad47ab 100644
--- a/jjb/integration/docker/integration-docker-onap-java11.yaml
+++ b/jjb/integration/docker/integration-docker-onap-java11.yaml
@@ -48,23 +48,16 @@
- project:
name: 'integration-docker-onap-java11-docker'
jobs:
- - '{project-name}-{stream}-verify-docker'
- - '{project-name}-{stream}-merge-docker'
- - gerrit-maven-docker-stage:
- mvn-params: '-P docker -Dmaven.test.skip=true'
- build-node: ubuntu1804-docker-8c-8g
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
+ - gerrit-docker-verify
+ - gerrit-docker-merge
project-name: 'integration-docker-onap-java11'
project: 'integration/docker/onap-java11'
stream:
- 'master':
- branch: 'master'
- mvn-params: '-P spring-boot-2-1'
- docker_name: 'onap/integration-java11'
- docker_build_args: '-f ./Dockerfile'
- docker_root: '$WORKSPACE'
+ branch: 'master'
+ files: ''
+ docker-name: 'onap/integration-java11'
+ docker-build-args: '-f ./Dockerfile'
+ docker-root: '$WORKSPACE'
mvn-settings: 'integration-settings'
- mvn-version: 'mvn35'
- files: '**'
build-node: ubuntu1804-docker-8c-8g
diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml
index 3920653..c39ca2a 100644
--- a/jjb/integration/integration-docker.yaml
+++ b/jjb/integration/integration-docker.yaml
@@ -3,8 +3,8 @@
name: integration-docker
project-name: 'integration'
jobs:
- - '{project-name}-{stream}-{subproject}-docker-merge'
- - '{project-name}-{stream}-{subproject}-docker-verify'
+ - integration-docker-merge
+ - integration-docker-verify
project: 'integration'
stream:
- 'master':
@@ -13,6 +13,20 @@
- 'sniroemulator':
pom: 'test/mocks/sniroemulator/pom.xml'
pattern: 'test/mocks/sniroemulator/**'
+ - 'mass-pnf-sim':
+ pom: 'test/mocks/mass-pnf-sim/pnf-sim-lightweight/pom.xml'
+ pattern: 'test/mocks/mass-pnf-sim/**'
+ mvn-goals: 'clean package docker:build -Dcheckstyle.skip'
+ PNF_INSTANCES: 1
+ post-docker-verify-script: |
+ #!/bin/bash
+ set -ex # Fail build if any setup step fails
+ cd $WORKSPACE/test/mocks/mass-pnf-sim
+ ./mass-pnf-sim.py --bootstrap {PNF_INSTANCES} --urlves http://127.0.0.1:10000/eventListener/v7 --ipfileserver 127.0.0.1 --typefileserver sftp --ipstart 10.11.0.16
+ ./mass-pnf-sim.py --start {PNF_INSTANCES}
+ ./mass-pnf-sim.py --trigger {PNF_INSTANCES}
+ ./mass-pnf-sim.py --stop {PNF_INSTANCES}
+ ./mass-pnf-sim.py --clean
mvn-settings: 'integration-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/integration/integration-templates-docker.yaml b/jjb/integration/integration-templates-docker.yaml
index e434d0a..9c2682d 100644
--- a/jjb/integration/integration-templates-docker.yaml
+++ b/jjb/integration/integration-templates-docker.yaml
@@ -1,9 +1,11 @@
---
- job-template:
name: '{project-name}-{stream}-{subproject}-docker-merge'
+ id: integration-docker-merge
project-type: freestyle
node: 'ubuntu1804-docker-8c-8g'
docker-image-name: ''
+ mvn-goals: 'clean package docker:build docker:push'
properties:
- infra-properties:
@@ -38,7 +40,6 @@
files: '{pattern}'
builders:
-
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -48,7 +49,7 @@
- maven-target:
maven-version: '{maven-version}'
pom: '{pom}'
- goals: 'clean package docker:build docker:push'
+ goals: '{mvn-goals}'
settings: '{mvn-settings}'
settings-type: cfp
global-settings: 'global-settings'
@@ -63,9 +64,12 @@
- job-template:
name: '{project-name}-{stream}-{subproject}-docker-verify'
+ id: integration-docker-verify
project-type: freestyle
node: 'ubuntu1804-docker-8c-8g'
docker-image-name: ''
+ mvn-goals: 'clean package docker:build'
+ post-docker-verify-script: ''
properties:
- infra-properties:
@@ -100,7 +104,6 @@
files: '{pattern}'
builders:
-
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -110,7 +113,7 @@
- maven-target:
maven-version: '{maven-version}'
pom: '{pom}'
- goals: 'clean package docker:build'
+ goals: '{mvn-goals}'
settings: '{mvn-settings}'
settings-type: cfp
global-settings: 'global-settings'
@@ -118,12 +121,12 @@
properties:
- docker.pull.registry=nexus3.onap.org:10001
- docker.push.registry=nexus3.onap.org:10003
+ - shell: '{post-docker-verify-script}'
publishers:
- infra-shiplogs:
maven-version: '{maven-version}'
-
- job-template:
name: '{project-name}-{stream}-{subproject}-docker-compose-verify'
id: integration-docker-compose-verify
diff --git a/jjb/integration/simulators/integration-pnf-simulator.yaml b/jjb/integration/simulators/integration-pnf-simulator.yaml
index df000a1..d24b9df 100644
--- a/jjb/integration/simulators/integration-pnf-simulator.yaml
+++ b/jjb/integration/simulators/integration-pnf-simulator.yaml
@@ -5,7 +5,7 @@
stream:
- 'master':
branch: 'master'
- java-version: openjdk8
+ java-version: openjdk11
project: 'integration/simulators/pnf-simulator'
mvn-settings: 'integration-simulators-pnf-simulator-settings'
files: '**'
@@ -33,7 +33,7 @@
- project:
name: integration-simulators-pnf-simulator-sonar
- java-version: openjdk8
+ java-version: openjdk11
jobs:
- gerrit-maven-sonar
sonarcloud: true
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 19e2957..018a649 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -59,7 +59,7 @@
files: '**'
archive-artifacts: ''
build-node: ubuntu1804-docker-8c-8g
- maven-version: 'mvn35'
+ maven-version: 'mvn36'
#- project:
# name: sdc-arm64
diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml
index 58bab20..cb70a08 100644
--- a/jjb/testsuite/testsuite.yaml
+++ b/jjb/testsuite/testsuite.yaml
@@ -24,26 +24,9 @@
project: 'testsuite'
- extra-project1: 'testsuite/python-testing-utils'
- extra-branch1: '{branch}'
- extra-refspec1: 'refs/heads/{branch}'
- checkout-dir1: 'testsuite/eteutils'
-
- extra-project2: 'testsuite/heatbridge'
- extra-branch2: '{branch}'
- extra-refspec2: 'refs/heads/{branch}'
- checkout-dir2: 'testsuite/heatbridge'
-
- extra-project3: 'demo'
- extra-branch3: '{branch}'
- extra-refspec3: 'refs/heads/{branch}'
- checkout-dir3: 'demo'
-
stream:
- 'master':
branch: 'master'
- - 'dublin':
- branch: 'dublin'
- 'elalto':
branch: 'elalto'
mvn-settings: 'testsuite-settings'
diff --git a/jjb/vid/vid-csit.yaml b/jjb/vid/vid-csit.yaml
index c300a50..6f734e5 100644
--- a/jjb/vid/vid-csit.yaml
+++ b/jjb/vid/vid-csit.yaml
@@ -9,8 +9,6 @@
stream:
- 'master':
branch: 'master'
- - 'dublin':
- branch: 'dublin'
functionality:
- 'healthCheck':
trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml
index a8668dc..75da082 100644
--- a/jjb/vid/vid.yaml
+++ b/jjb/vid/vid.yaml
@@ -27,8 +27,8 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'vid-settings'
files: '**'
archive-artifacts: ''