Skip to content
Permalink
Browse files

[bamboo] Automated branch merge (from release-25.1.1:b405b23f71ef649c…

…4b6f3824ee8750603b4a533d)
  • Loading branch information
opennms-bamboo committed Nov 22, 2019
2 parents 5eb7375 + b405b23 commit ae5ffdbe34ac9d127428c7ef45fd1574346222db
Showing with 649 additions and 205 deletions.
  1. +133 −29 .circleci/config.yml
  2. +21 −0 .circleci/scripts/makedeb.sh
  3. +1 −0 core/cli/src/test/shell/spec/find-java.spec.sh
  4. +10 −1 core/web-assets/pom.xml
  5. +10 −0 debian/.gitignore
  6. +8 −0 debian/changelog
  7. +4 −4 debian/control
  8. +8 −8 debian/rules
  9. +1 −1 dependencies/drools/pom.xml
  10. +32 −6 features/wsman/src/main/java/org/opennms/netmgt/poller/monitors/WsManMonitor.java
  11. +0 −1 features/wsman/src/test/java/org/opennms/netmgt/poller/monitors/WSManMonitorTest.java
  12. +184 −115 makedeb.sh
  13. +2 −2 opennms-assemblies/minion/src/main/filtered/debian/control
  14. +2 −2 opennms-assemblies/sentinel/src/main/filtered/debian/control
  15. +13 −10 opennms-base-assembly/src/main/filtered/bin/opennms
  16. +1 −0 opennms-base-assembly/src/main/filtered/bin/send-event.pl
  17. +1 −0 opennms-base-assembly/src/test/shell/spec/opennms.spec.sh
  18. +1 −0 opennms-base-assembly/src/test/shell/spec/runjava.spec.sh
  19. +1 −1 opennms-container/horizon/build_container_image.sh
  20. +1 −1 opennms-container/minion/build_container_image.sh
  21. +1 −1 opennms-container/sentinel/build_container_image.sh
  22. +1 −1 ...-engine/src/test/java/org/opennms/netmgt/correlation/drools/DroolsCorrelationEngineBuilderIT.java
  23. +62 −0 ...drools-correlation-engine/src/test/java/org/opennms/netmgt/correlation/drools/FromModifyTest.java
  24. +39 −0 ...tion-engine/src/test/opennms-home/etc/drools-engine.d/fromWithModifyRules/FromWithModifyRules.drl
  25. +11 −0 ...orrelation-engine/src/test/opennms-home/etc/drools-engine.d/fromWithModifyRules/drools-engine.xml
  26. +9 −0 ...ine/src/test/opennms-home/etc/drools-engine.d/fromWithModifyRules/fromWithModifyRules-context.xml
  27. +3 −0 ...-provision/opennms-provisiond/src/main/java/org/opennms/netmgt/provision/service/Provisioner.java
  28. +1 −3 ...ision/opennms-provisiond/src/test/java/org/opennms/netmgt/provision/service/NewSuspectScanIT.java
  29. +6 −6 ...vision/opennms-provisiond/src/test/java/org/opennms/netmgt/provision/service/ProvisionerTest.java
  30. +7 −2 ...ion/opennms-provisiond/src/test/java/org/opennms/netmgt/provision/service/ProvisioningITCase.java
  31. +69 −0 ...nms-rrd/opennms-rrd-tcp/src/test/java/org/opennms/netmgt/rrd/tcp/PerformanceDataProtobufTest.java
  32. BIN opennms-rrd/opennms-rrd-tcp/src/test/resources/rrd-perf.dat
  33. +4 −1 opennms-webapp/src/main/webapp/WEB-INF/jsp/alarm/list.jsp
  34. +1 −3 tools/packages/minion/minion.spec
  35. +1 −7 tools/packages/sentinel/sentinel.spec
@@ -1,9 +1,12 @@
version: 2.1

executors:
build-executor:
centos-build-executor:
docker:
- image: opennms/build-env:jdk8-jdk11-3.6.2-b2942
- image: opennms/build-env:1.8.0.232.b09-3.6.2-b3291
debian-build-executor:
docker:
- image: opennms/build-env:debian-jdk8-b3572
integration-test-executor:
machine: true
smoke-test-executor:
@@ -31,7 +34,7 @@ commands:
restore-maven-cache:
description: "Maven: Calculate cache key and restore cache"
steps:
- run:
- run:
name: Calculate cache key from pom files
command: |
find . -type f -name "pom.xml" -exec sha256sum "{}" \; | sort -nr >> maven-dependency-cache.key
@@ -291,23 +294,23 @@ workflows:
build-deploy:
jobs:
- build
- horizon-package-build:
- horizon-rpm-build:
requires:
- build
- minion-package-build:
- minion-rpm-build:
requires:
- build
- sentinel-package-build:
- sentinel-rpm-build:
requires:
- build
- integration-test:
requires:
- build
- smoke-test-full:
requires:
- horizon-package-build
- minion-package-build
- sentinel-package-build
- horizon-rpm-build
- minion-rpm-build
- sentinel-rpm-build
filters:
branches:
only:
@@ -320,9 +323,9 @@ workflows:
- /.*smoke.*/
- smoke-test-minimal:
requires:
- horizon-package-build
- minion-package-build
- sentinel-package-build
- horizon-rpm-build
- minion-rpm-build
- sentinel-rpm-build
filters:
branches:
ignore:
@@ -335,40 +338,78 @@ workflows:
- /.*smoke.*/
- horizon-publish-oci:
requires:
- horizon-package-build
- horizon-rpm-build
filters:
branches:
only:
- master
- develop
- minion-publish-oci:
requires:
- minion-package-build
- minion-rpm-build
filters:
branches:
only:
- master
- develop
- sentinel-publish-oci:
requires:
- sentinel-package-build
- sentinel-rpm-build
filters:
branches:
only:
- master
- develop
# These don't actually require `integration-test` but we shouldn't bother
# spending cycles unless everything else passed
- horizon-deb-build:
requires:
- integration-test
filters:
branches:
only:
- master
- develop
- /^release-.*/
- /^foundation.*/
- /^features.*/
- /.*smoke.*/
- minion-deb-build:
requires:
- integration-test
filters:
branches:
only:
- master
- develop
- /^release-.*/
- /^foundation.*/
- /^features.*/
- /.*smoke.*/
- sentinel-deb-build:
requires:
- integration-test
filters:
branches:
only:
- master
- develop
- /^release-.*/
- /^foundation.*/
- /^features.*/
- /.*smoke.*/

jobs:
build:
executor: build-executor
executor: centos-build-executor
# Building currently requires the xlarge containers in order for the webpack compilation
# in the core/web-assets module to complete reliably
resource_class: xlarge
steps:
- run-build:
number-vcpu: 8
horizon-package-build:
executor: build-executor
horizon-rpm-build:
executor: centos-build-executor
# Larger memory footprint required to speed up builds using Takari smartbuilder
resource_class: large
steps:
@@ -397,10 +438,10 @@ jobs:
root: ~/
paths:
- project/opennms-container/horizon/images/
minion-package-build:
executor: build-executor
minion-rpm-build:
executor: centos-build-executor
# Larger memory footprint required to speed up builds using Takari smartbuilder
# Will need to increase resource class if horizon-package-build is under 15 min
# Will need to increase resource class if horizon-rpm-build is under 15 min
resource_class: large
steps:
- attach_workspace:
@@ -429,10 +470,10 @@ jobs:
root: ~/
paths:
- project/opennms-container/minion/images/
sentinel-package-build:
executor: build-executor
sentinel-rpm-build:
executor: centos-build-executor
# Larger memory footprint required to speed up builds using Takari smartbuilder
# Will need to increase resource class if horizon-package-build is under 19 min
# Will need to increase resource class if horizon-rpm-build is under 19 min
resource_class: large
steps:
- attach_workspace:
@@ -461,8 +502,71 @@ jobs:
root: ~/
paths:
- project/opennms-container/sentinel/images/
horizon-deb-build:
executor: debian-build-executor
# Larger memory footprint required to speed up builds using Takari smartbuilder
resource_class: large
steps:
- attach_workspace:
at: ~/
- run:
name: Build Debian Packages
command: |
export NODE_OPTIONS=--max_old_space_size=1024
export CCI_MAXCPU=4
.circleci/scripts/makedeb.sh opennms
- run:
name: Move Debian Files
command: |
mkdir -p ~/project/target/debs && \
mv ~/*.deb ~/*.changes ~/project/target/debs
- store_artifacts:
path: ~/project/target/debs
destination: debs
minion-deb-build:
executor: debian-build-executor
resource_class: large
steps:
- attach_workspace:
at: ~/
- run:
name: Build Debian Packages
command: |
export NODE_OPTIONS=--max_old_space_size=1024
export CCI_MAXCPU=4
export CCI_VAADINJAVAMAXMEM=768m
.circleci/scripts/makedeb.sh minion
- run:
name: Move Debian Files
command: |
mkdir -p ~/project/target/debs && \
mv ~/*.deb ~/*.changes ~/project/target/debs
- store_artifacts:
path: ~/project/target/debs
destination: debs
sentinel-deb-build:
executor: debian-build-executor
resource_class: large
steps:
- attach_workspace:
at: ~/
- run:
name: Build Debian Packages
command: |
export NODE_OPTIONS=--max_old_space_size=1024
export CCI_MAXCPU=4
export CCI_VAADINJAVAMAXMEM=768m
.circleci/scripts/makedeb.sh sentinel
- run:
name: Move Debian Files
command: |
mkdir -p ~/project/target/debs && \
mv ~/*.deb ~/*.changes ~/project/target/debs
- store_artifacts:
path: ~/project/target/debs
destination: debs
horizon-publish-oci:
executor: build-executor
executor: centos-build-executor
steps:
- attach_workspace:
at: ~/
@@ -477,7 +581,7 @@ jobs:
./tag.sh
./publish.sh
minion-publish-oci:
executor: build-executor
executor: centos-build-executor
steps:
- attach_workspace:
at: ~/
@@ -492,7 +596,7 @@ jobs:
./tag.sh
./publish.sh
sentinel-publish-oci:
executor: build-executor
executor: centos-build-executor
steps:
- attach_workspace:
at: ~/
@@ -505,7 +609,7 @@ jobs:
cd opennms-container/sentinel
docker image load -i images/container.oci
./tag.sh
./publish.sh
./publish.sh
integration-test:
executor: integration-test-executor
parallelism: 4
@@ -522,7 +626,7 @@ jobs:
failure-option: -fn
changes-only: false
code-coverage:
executor: build-executor
executor: centos-build-executor
resource_class: medium
steps:
- attach_workspace:
@@ -0,0 +1,21 @@
#!/bin/bash

MYDIR="$(dirname "$0")"
MYDIR="$(cd "$MYDIR"; pwd)"

if [ -z "$1" ]; then
echo "usage: $0 <package>"
echo ""
exit 1
fi

PACKAGE_NAME="$1"

if [ -n "$GPG_SECRET_KEY" ] && [ -n "$GPG_PASSPHRASE" ]; then
echo "PGP key found... signing Debian packages"
. "$MYDIR/configure-signing.sh"
./makedeb.sh -a -d -s '***REDACTED***' "$PACKAGE_NAME"
else
echo "PGP key not found... skipping Debian package signing"
./makedeb.sh -a -d "$PACKAGE_NAME"
fi
@@ -90,4 +90,5 @@ testMatchingJavaSpecifiedIsNotInRange() {
assertEquals "No match found!" "$output"
}

# shellcheck disable=SC1090,SC1091
. "$SHUNITDIR/shunit2"
@@ -73,7 +73,7 @@
<phase>generate-resources</phase>
<configuration>
<skip>${skipNodeJSBuild}</skip>
<arguments>--prefer-offline --no-progress clean-install</arguments>
<arguments>--prefer-offline --no-progress install</arguments>
</configuration>
</execution>
<execution>
@@ -163,6 +163,15 @@
<skipNodeJSBuild>true</skipNodeJSBuild>
</properties>
</profile>
<profile>
<id>forceCompile</id>
<activation>
<file><missing>target/dist/assets/opennms.js</missing></file>
</activation>
<properties>
<skipNodeJSBuild>false</skipNodeJSBuild>
</properties>
</profile>
</profiles>
<dependencies>
<dependency>
@@ -13,17 +13,27 @@ opennms-db
opennms-doc
opennms-jmx-config-generator
opennms-plugin-collector-juniper-tca
opennms-plugin-collector-vtdxml-handler
opennms-plugin-northbounder-jms
opennms-plugin-provisioning-dns
opennms-plugin-provisioning-rancid
opennms-plugin-provisioning-reverse-dns
opennms-plugin-provisioning-snmp-asset
opennms-plugin-provisioning-snmp-hardware-inventory
opennms-plugin-protocol-cifs
opennms-plugin-protocol-nsclient
opennms-plugin-protocol-radius
opennms-plugin-protocol-xml
opennms-plugin-protocol-xmp
opennms-plugin-ticketer-jira
opennms-plugin-ticketer-otrs
opennms-plugin-ticketer-rt
opennms-plugins
opennms-remote-poller
opennms-remote-poller.default
opennms-remote-poller.init
opennms-server
opennms-source
opennms-webapp-hawtio
opennms-webapp-jetty
opennms-webapp-remoting

0 comments on commit ae5ffdb

Please sign in to comment.
You can’t perform that action at this time.