Build #1,635

Build: #1635 failed

Job: Installer Snapshot was successful

Code commits

OpenNMS (develop branch)

  • Benjamin Reed

    Benjamin Reed d5562ec231fbbbf18736d903a806c17408c398cc

    NMS-10565: more improvements to shell scripts (#2359)
    * NMS-10565: more improvements to shell scripts

    * allow overriding JAVA_SEARCH_DIRS in `find-java.sh` for testing
    * allow specifying an individual java path to check in `find-java.sh`
    * support skipping the default JAVA_SEARCH_DIRS in `find-java.sh`
    * change `runjava` to always use `find-java.sh` if possible to
      validate java versions, which has stricter/better version-processing
    * allow adding one or more additional search paths to the `runjava`
      command-line to aid in testing
    * resolve symlinks to make it easier to know what the "real"
      $JAVA_HOME being resolved is
    * add tests for `find-java.sh`
    * more test coverage for `runjava` including searching multiple
      test JDK directories
    * fix shunit2 `assertEquals` (expected is the 2nd arg, not 1st)

    * NSM-10565: make sure HOME is not set during tests (avoid ~/.opennms-dev)

    * NMS-10565: create a utility library for array and conf handling

    * NMS-10565: fix conf-file parsing

    This PR changes opennms's `opennms.conf` parsing to handle any
    combination of scalar or array-based variables, in multiple
    configuration files.  This makes sure that mixing and matching
    old-style `opennms.conf` from `~/.opennms-dev/` and from
    `$OPENNMS_HOME/etc/` behaves properly, and provides robust
    guards to make sure environment variables are always turned
    into arrays before using them internally.

    * convert `opennms` to use `$OPENNMS_HOME/bin/_lib.sh`
    * fix `opennms` "dry-run" output to wrap arguments in quotes
      to aid in unit testing
    * add an additional configuration file from Jesse to test against
    * change all `opennms.spec.sh` unit tests to check for quoted
      arguments

    * NMS-10565: if $TMPDIR is not set, fall back to a dir in /tmp

    * use the return of `grep -q` directly

    Co-Authored-By: RangerRick <github@raccoonfink.com>

    * NMS-10565: updates from feedback, also fix an issue with var replacement

    • opennms-base-assembly/src/main/filtered/bin/_lib.sh (version d5562ec231fbbbf18736d903a806c17408c398cc)
    • opennms-base-assembly/src/main/filtered/bin/find-java.sh (version d5562ec231fbbbf18736d903a806c17408c398cc)
    • opennms-base-assembly/src/main/filtered/bin/opennms (version d5562ec231fbbbf18736d903a806c17408c398cc)
    • opennms-base-assembly/src/main/filtered/bin/runjava (version d5562ec231fbbbf18736d903a806c17408c398cc)
    • opennms-base-assembly/src/test/shell/execute-test.sh (version d5562ec231fbbbf18736d903a806c17408c398cc)
    • opennms-base-assembly/src/test/shell/init.sh (version d5562ec231fbbbf18736d903a806c17408c398cc)
    • opennms-base-assembly/src/test/shell/spec/_lib.spec.sh (version d5562ec231fbbbf18736d903a806c17408c398cc)
    • opennms-base-assembly/src/test/shell/spec/find-java.spec.sh (version d5562ec231fbbbf18736d903a806c17408c398cc)
    • opennms-base-assembly/src/test/shell/spec/opennms.jessie.java.conf (version d5562ec231fbbbf18736d903a806c17408c398cc)
    • opennms-base-assembly/src/test/shell/spec/opennms.spec.sh (version d5562ec231fbbbf18736d903a806c17408c398cc)
    • opennms-base-assembly/src/test/shell/spec/runjava-fakejava (version d5562ec231fbbbf18736d903a806c17408c398cc)
    • opennms-base-assembly/src/test/shell/spec/runjava.spec.sh (version d5562ec231fbbbf18736d903a806c17408c398cc)
  • Chandra Gorantla <chandra@opennms.com>

    Chandra Gorantla <chandra@opennms.com> e3eaa544e52dfc2d4a07a3808d2b2cf0574c50d2

    OIA-4: Map collectors from integration api (#2345)
    * OIA-4: Map collectors from integration api

    * OIA-4: Move mappers to different class, add unit test.

    • features/api-layer/src/main/java/org/opennms/features/apilayer/collectors/CollectionSetMapper.java (version e3eaa544e52dfc2d4a07a3808d2b2cf0574c50d2)
    • features/api-layer/src/main/java/org/opennms/features/apilayer/collectors/CollectorRequestBuilderImpl.java (version e3eaa544e52dfc2d4a07a3808d2b2cf0574c50d2)
    • features/api-layer/src/main/java/org/opennms/features/apilayer/collectors/ServiceCollectorClientImpl.java (version e3eaa544e52dfc2d4a07a3808d2b2cf0574c50d2)
    • features/api-layer/src/main/java/org/opennms/features/apilayer/collectors/ServiceCollectorImpl.java (version e3eaa544e52dfc2d4a07a3808d2b2cf0574c50d2)
    • features/api-layer/src/main/java/org/opennms/features/apilayer/collectors/ServiceCollectorManager.java (version e3eaa544e52dfc2d4a07a3808d2b2cf0574c50d2)
    • features/api-layer/src/main/java/org/opennms/features/apilayer/pollers/ServicePollerManager.java (version e3eaa544e52dfc2d4a07a3808d2b2cf0574c50d2)
    • features/api-layer/src/main/java/org/opennms/features/apilayer/utils/InterfaceMapper.java (version e3eaa544e52dfc2d4a07a3808d2b2cf0574c50d2)
    • features/api-layer/src/main/resources/OSGI-INF/blueprint/blueprint.xml (version e3eaa544e52dfc2d4a07a3808d2b2cf0574c50d2)
    • features/api-layer/src/test/java/org/opennms/features/apilayer/config/CollectionSetMapperTest.java (version e3eaa544e52dfc2d4a07a3808d2b2cf0574c50d2)
    • features/collection/api/src/main/java/org/opennms/netmgt/collection/support/DefaultServiceCollectorRegistry.java (version e3eaa544e52dfc2d4a07a3808d2b2cf0574c50d2)
    • features/collection/client-rpc/src/main/java/org/opennms/netmgt/collection/client/rpc/CollectorRequestBuilderImpl.java (version e3eaa544e52dfc2d4a07a3808d2b2cf0574c50d2)
    • features/collection/client-rpc/src/main/resources/META-INF/opennms/applicationContext-rpc-collector.xml (version e3eaa544e52dfc2d4a07a3808d2b2cf0574c50d2)
    • features/collection/shell-commands/src/main/java/org/opennms/netmgt/collection/commands/CollectCommand.java (version e3eaa544e52dfc2d4a07a3808d2b2cf0574c50d2)
    • features/kafka/producer/src/main/java/org/opennms/features/kafka/producer/collection/CollectionSetMapper.java (version e3eaa544e52dfc2d4a07a3808d2b2cf0574c50d2)
    • pom.xml (version e3eaa544e52dfc2d4a07a3808d2b2cf0574c50d2)