Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adapting templates to state if 8.7.1 tarball #317

Closed
wants to merge 64 commits into from

Conversation

timdeluxe
Copy link
Contributor

Pull Request (PR) description

This adapts the templates for java-check, server.xml and setenv to the state of the 8.7.1 tarball, while keeping required modifications in place.

I thought about setting stuff depending on the installed java version, however not everyone installs java also via puppet and if ones does it, it must not necessarily be via the java puppet module.
Maybe we need an additional parameter to the module stating the java version?

This Pull Request (PR) fixes the following issues

Fixes #300

@timdeluxe
Copy link
Contributor Author

I see failing tests, but those are not related to my changes, but to a general issue: moby/moby#38749
If you look at that issue, other puppet modules stopped the test on centos-7 completely or pinned it to a specific version. Maybe one of those solutions should be adapted to this module also?

dhoppe and others added 21 commits May 26, 2020 08:37
…, voxpupuli#304, voxpupuli#318, voxpupuli#319

Co-authored-by: Alexander Fisher <alex@linfratech.co.uk>
Co-authored-by: Tim Meusel <tim@bastelfreak.de>
Co-authored-by: Tim Meusel <tim@bastelfreak.de>
Co-authored-by: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Co-authored-by: Robert Freiberger <rfreiberger@gmail.com>
May 26 13:01:40 centos7-64-1 systemd[1]: New main
PID 3276 does not belong to service, and PID file
is not owned by root. Refusing.
Co-authored-by: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Added >= to capture version 7.0.0 as using the "software" url
Modulesync 2.12.0, Fix Travis CI pipeline etc.
Update jira::facts to check for Puppet AIO agent
kenyon and others added 27 commits November 22, 2020 01:22
remove incorrect apostrophe in example
As of openjdk 11 it is necessary to make the extra
opts manageable so that -XX:+PrintGCDateStamps can
be replaced with -Xlog:::time,uptime,level,tags.
This change introduces the new variable into
init.ppp and uses it for the JVM_EXTRA_ARGS variable
in setenv.sh.

Further with the new mysql-connector (as of version) 8,
the archive does not contain a "-bin" jarfile. Instead
the connector is just named mysql-connector-java-<version>.jar

Updating setenv.sh to JIRA 8.12.1 options and replace
the old scope.lookupvar usage.

Move jvm version dependent configuration to setenv.sh.
Either specify jvm_type = custom and use the jvm_* parameters
or use the predefined values in the setenv.sh by using
jvm_type =  'openjdk-11' / 'oracle-jdk-1.8'
Adding tests for JVM arguments in setenv for JIRA 8.12.1

Further a change in setenv.sh was intoduced: cd sequence
out of original setenv.sh is needed, as the dirs cd'Ed
into may exist or not. If they exist they change the
LOGBASEABS, if not it's just the jira base install directory
If you are using jvm_type = 'openjdk-11' the additional
variables are added to the respective environment variables
before JIRA start. This helps that one does not need to
configure jvm_type = 'custom' if just one parameter is
missing.
Make JVM_EXTRA_ARGS manageable for java 11 compatibility
Fixing that the suffix can be empty as well (needed for mysql-connector > 8)
There is nothing sensitive about the content of this script, so let's
use the standard mode 0755 used for executables.
This drops support for sysvinit and only supports systemd. This should
cover all current supported distros and cleans up the code.
facts.pp: use less restrictive mode for the external fact script
Version 9.4 doesn't exist in the postgresql.org repos anymore, which
caused this test to fail. Simply using the default version that the
puppetlabs-postgresql module wants works fine.
Fixes voxpupuli#330.

Co-authored-by: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
templates/facts.rb.erb: update URI.open syntax to fix deprecation warnings
…ersion

acceptance tests: use the default version of postgresql
On Debian-based distros /usr/lib/systemd doesn't exist while on Red Hat
7+ /lib is a symlink to /usr/lib. That means using /lib/systemd works on
all supported distros.

Fixes: 23242f9
Fix unit tests after sysvinit patch broke them
By specifying the dependencies on the resources, the chain is simpler.
This allows Java to be installed even if PostgreSQL fails. The benefit
is that it's easier to see in one go if things fail.
1112c0a changed the file to use
bashisms, but on Ubuntu /bin/sh is dash, not bash. [[ is not supported.
These JVM args are unrecognized on CentOS 7 and cause Jira to fail to
start.
Ubuntu 16.04 standard support ends in a few weeks. Including Ubuntu
16.04 support causes our acceptance tests to hang. See
voxpupuli#334 (comment)
for details.

Also update some versions in the README.
…sue-300

# Conflicts:
#	templates/setenv.sh.erb
@timdeluxe
Copy link
Contributor Author

I was too dumb updating my branch. I will close this and raise another PR. I am sorry.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Java 11 Compatibility