Compare commits
16 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
58edff7fd0 | ||
|
|
4ee756a53c | ||
|
|
3667063d07 | ||
|
|
ee323980c7 | ||
|
|
6a8f03bb17 | ||
|
|
4f17bb9937 | ||
|
|
f3bfd78279 | ||
|
|
4c3e026fc8 | ||
|
|
29f7c890ed | ||
|
|
d9969df148 | ||
|
|
9210295606 | ||
|
|
43bd5e73af | ||
|
|
460daa1a80 | ||
|
|
6bcee4a5fd | ||
|
|
6aea9f9833 | ||
|
|
13d30c2e2d |
6
.devcontainer/Dockerfile
Normal file
6
.devcontainer/Dockerfile
Normal file
@@ -0,0 +1,6 @@
|
||||
FROM puppet/pdk:latest
|
||||
|
||||
# [Optional] Uncomment this section to install additional packages.
|
||||
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
|
||||
# && apt-get -y install --no-install-recommends <your-package-list-here>
|
||||
|
||||
23
.devcontainer/devcontainer.json
Normal file
23
.devcontainer/devcontainer.json
Normal file
@@ -0,0 +1,23 @@
|
||||
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
|
||||
// https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/puppet
|
||||
{
|
||||
"name": "Puppet Development Kit (Community)",
|
||||
"dockerFile": "Dockerfile",
|
||||
|
||||
// Set *default* container specific settings.json values on container create.
|
||||
"settings": {
|
||||
"terminal.integrated.shell.linux": "/bin/bash"
|
||||
},
|
||||
|
||||
// Add the IDs of extensions you want installed when the container is created.
|
||||
"extensions": [
|
||||
"puppet.puppet-vscode",
|
||||
"rebornix.Ruby"
|
||||
]
|
||||
|
||||
// Use 'forwardPorts' to make a list of ports inside the container available locally.
|
||||
// "forwardPorts": [],
|
||||
|
||||
// Use 'postCreateCommand' to run commands after the container is created.
|
||||
// "postCreateCommand": "pdk --version",
|
||||
}
|
||||
230
.github/workflows/nightly.yml
vendored
Normal file
230
.github/workflows/nightly.yml
vendored
Normal file
@@ -0,0 +1,230 @@
|
||||
name: "nightly"
|
||||
|
||||
on:
|
||||
schedule:
|
||||
- cron: '0 0 * * *'
|
||||
|
||||
env:
|
||||
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
|
||||
HONEYCOMB_DATASET: litmus tests
|
||||
|
||||
jobs:
|
||||
setup_matrix:
|
||||
name: "Setup Test Matrix"
|
||||
runs-on: ubuntu-20.04
|
||||
outputs:
|
||||
matrix: ${{ steps.get-matrix.outputs.matrix }}
|
||||
|
||||
steps:
|
||||
- name: "Honeycomb: Start recording"
|
||||
uses: kvrhdn/gha-buildevents@v1.0.2
|
||||
with:
|
||||
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
|
||||
dataset: ${{ env.HONEYCOMB_DATASET }}
|
||||
job-status: ${{ job.status }}
|
||||
|
||||
- name: "Honeycomb: Start first step"
|
||||
run: |
|
||||
echo STEP_ID=0 >> $GITHUB_ENV
|
||||
echo STEP_START=$(date +%s) >> $GITHUB_ENV
|
||||
|
||||
- name: Checkout Source
|
||||
uses: actions/checkout@v2
|
||||
if: ${{ github.repository_owner == 'puppetlabs' }}
|
||||
|
||||
- name: Activate Ruby 2.7
|
||||
uses: actions/setup-ruby@v1
|
||||
if: ${{ github.repository_owner == 'puppetlabs' }}
|
||||
with:
|
||||
ruby-version: "2.7"
|
||||
|
||||
- name: Cache gems
|
||||
uses: actions/cache@v2
|
||||
if: ${{ github.repository_owner == 'puppetlabs' }}
|
||||
with:
|
||||
path: vendor/gems
|
||||
key: ${{ runner.os }}-${{ github.event_name }}-${{ hashFiles('**/Gemfile') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-${{ github.event_name }}-
|
||||
${{ runner.os }}-
|
||||
|
||||
- name: Install gems
|
||||
if: ${{ github.repository_owner == 'puppetlabs' }}
|
||||
run: |
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'bundle config path vendor/gems' -- bundle config path vendor/gems
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'bundle config jobs 8' -- bundle config jobs 8
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'bundle config retry 3' -- bundle config retry 3
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'bundle install' -- bundle install
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'bundle clean' -- bundle clean
|
||||
|
||||
- name: Setup Acceptance Test Matrix
|
||||
id: get-matrix
|
||||
if: ${{ github.repository_owner == 'puppetlabs' }}
|
||||
run: |
|
||||
if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
|
||||
buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata
|
||||
else
|
||||
echo "::set-output name=matrix::{}"
|
||||
fi
|
||||
|
||||
- name: "Honeycomb: Record setup time"
|
||||
if: ${{ always() }}
|
||||
run: |
|
||||
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
|
||||
|
||||
Acceptance:
|
||||
needs:
|
||||
- setup_matrix
|
||||
|
||||
runs-on: ubuntu-20.04
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}}
|
||||
|
||||
env:
|
||||
BUILDEVENT_FILE: '../buildevents.txt'
|
||||
|
||||
steps:
|
||||
- run: |
|
||||
echo 'platform=${{ matrix.platform }}' >> $BUILDEVENT_FILE
|
||||
echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
|
||||
|
||||
- name: "Honeycomb: Start recording"
|
||||
uses: kvrhdn/gha-buildevents@v1.0.2
|
||||
with:
|
||||
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
|
||||
dataset: ${{ env.HONEYCOMB_DATASET }}
|
||||
job-status: ${{ job.status }}
|
||||
matrix-key: ${{ matrix.platform }}-${{ matrix.collection }}
|
||||
|
||||
- name: "Honeycomb: start first step"
|
||||
run: |
|
||||
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
|
||||
echo STEP_START=$(date +%s) >> $GITHUB_ENV
|
||||
|
||||
- name: Checkout Source
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Activate Ruby 2.7
|
||||
uses: actions/setup-ruby@v1
|
||||
with:
|
||||
ruby-version: "2.7"
|
||||
|
||||
- name: Cache gems
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
path: vendor/gems
|
||||
key: ${{ runner.os }}-${{ github.event_name }}-${{ hashFiles('**/Gemfile') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-${{ github.event_name }}-
|
||||
${{ runner.os }}-
|
||||
|
||||
- name: "Honeycomb: Record cache setup time"
|
||||
if: ${{ always() }}
|
||||
run: |
|
||||
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Cache retrieval'
|
||||
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
|
||||
echo STEP_START=$(date +%s) >> $GITHUB_ENV
|
||||
|
||||
- name: Bundler Setup
|
||||
run: |
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'bundle config path vendor/gems' -- bundle config path vendor/gems
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'bundle config jobs 8' -- bundle config jobs 8
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'bundle config retry 3' -- bundle config retry 3
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'bundle install' -- bundle install
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'bundle clean' -- bundle clean
|
||||
echo ::group::bundler environment
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
|
||||
echo ::endgroup::
|
||||
|
||||
- name: "Honeycomb: Record Bundler Setup time"
|
||||
if: ${{ always() }}
|
||||
run: |
|
||||
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Bundler Setup'
|
||||
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
|
||||
echo STEP_START=$(date +%s) >> $GITHUB_ENV
|
||||
|
||||
- name: Provision test environment
|
||||
run: |
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platform }}' -- bundle exec rake 'litmus:provision[provision::provision_service,${{ matrix.platform }}]'
|
||||
echo ::group::=== REQUEST ===
|
||||
cat request.json || true
|
||||
echo
|
||||
echo ::endgroup::
|
||||
echo ::group::=== INVENTORY ===
|
||||
sed -e 's/password: .*/password: "[redacted]"/' < inventory.yaml || true
|
||||
echo ::endgroup::
|
||||
|
||||
# The provision service hands out machines as soon as they're provisioned.
|
||||
# The GCP VMs might still take a while to spool up and configure themselves fully.
|
||||
# This retry loop spins until all agents have been installed successfully.
|
||||
- name: Install agent
|
||||
uses: nick-invision/retry@v1
|
||||
with:
|
||||
timeout_minutes: 30
|
||||
max_attempts: 5
|
||||
retry_wait_seconds: 60
|
||||
command: buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
|
||||
|
||||
# The agent installer on windows does not finish in time for this to work. To
|
||||
# work around this for now, retry after a minute if installing the module failed.
|
||||
- name: Install module
|
||||
uses: nick-invision/retry@v1
|
||||
with:
|
||||
timeout_minutes: 30
|
||||
max_attempts: 2
|
||||
retry_wait_seconds: 60
|
||||
command: buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
|
||||
|
||||
- name: "Honeycomb: Record deployment times"
|
||||
if: ${{ always() }}
|
||||
run: |
|
||||
echo ::group::honeycomb step
|
||||
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system'
|
||||
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
|
||||
echo STEP_START=$(date +%s) >> $GITHUB_ENV
|
||||
echo ::endgroup::
|
||||
|
||||
- name: Run acceptance tests
|
||||
run: |
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:acceptance:parallel' -- bundle exec rake 'litmus:acceptance:parallel'
|
||||
|
||||
- name: "Honeycomb: Record acceptance testing times"
|
||||
if: ${{ always() }}
|
||||
run: |
|
||||
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests'
|
||||
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-5 >> $GITHUB_ENV
|
||||
echo STEP_START=$(date +%s) >> $GITHUB_ENV
|
||||
|
||||
- name: Remove test environment
|
||||
if: ${{ always() }}
|
||||
run: |
|
||||
if [ -f inventory.yaml ]; then
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:tear_down' -- bundle exec rake 'litmus:tear_down'
|
||||
echo ::group::=== REQUEST ===
|
||||
cat request.json || true
|
||||
echo
|
||||
echo ::endgroup::
|
||||
fi
|
||||
|
||||
- name: "Honeycomb: Record removal times"
|
||||
if: ${{ always() }}
|
||||
run: |
|
||||
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Remove test environment'
|
||||
|
||||
slack-workflow-status:
|
||||
if: always()
|
||||
name: Post Workflow Status To Slack
|
||||
needs:
|
||||
- Acceptance
|
||||
runs-on: ubuntu-20.04
|
||||
steps:
|
||||
- name: Slack Workflow Notification
|
||||
uses: Gamesight/slack-workflow-status@master
|
||||
with:
|
||||
# Required Input
|
||||
repo_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
slack_webhook_url: ${{ secrets.SLACK_WEBHOOK }}
|
||||
# Optional Input
|
||||
channel: '#team-ia-bots'
|
||||
name: 'GABot'
|
||||
211
.github/workflows/pr_test.yml
vendored
Normal file
211
.github/workflows/pr_test.yml
vendored
Normal file
@@ -0,0 +1,211 @@
|
||||
name: "PR Testing"
|
||||
|
||||
on: [pull_request]
|
||||
|
||||
env:
|
||||
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
|
||||
HONEYCOMB_DATASET: litmus tests
|
||||
|
||||
jobs:
|
||||
setup_matrix:
|
||||
name: "Setup Test Matrix"
|
||||
runs-on: ubuntu-20.04
|
||||
outputs:
|
||||
matrix: ${{ steps.get-matrix.outputs.matrix }}
|
||||
|
||||
steps:
|
||||
- name: "Honeycomb: Start recording"
|
||||
uses: kvrhdn/gha-buildevents@v1.0.2
|
||||
with:
|
||||
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
|
||||
dataset: ${{ env.HONEYCOMB_DATASET }}
|
||||
job-status: ${{ job.status }}
|
||||
|
||||
- name: "Honeycomb: Start first step"
|
||||
run: |
|
||||
echo STEP_ID=0 >> $GITHUB_ENV
|
||||
echo STEP_START=$(date +%s) >> $GITHUB_ENV
|
||||
|
||||
- name: Checkout Source
|
||||
uses: actions/checkout@v2
|
||||
if: ${{ github.repository_owner == 'puppetlabs' }}
|
||||
|
||||
- name: Activate Ruby 2.7
|
||||
uses: actions/setup-ruby@v1
|
||||
if: ${{ github.repository_owner == 'puppetlabs' }}
|
||||
with:
|
||||
ruby-version: "2.7"
|
||||
|
||||
- name: Cache gems
|
||||
uses: actions/cache@v2
|
||||
if: ${{ github.repository_owner == 'puppetlabs' }}
|
||||
with:
|
||||
path: vendor/gems
|
||||
key: ${{ runner.os }}-${{ github.event_name }}-${{ hashFiles('**/Gemfile') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-${{ github.event_name }}-
|
||||
${{ runner.os }}-
|
||||
|
||||
- name: Install gems
|
||||
if: ${{ github.repository_owner == 'puppetlabs' }}
|
||||
run: |
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'bundle config path vendor/gems' -- bundle config path vendor/gems
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'bundle config jobs 8' -- bundle config jobs 8
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'bundle config retry 3' -- bundle config retry 3
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'bundle install' -- bundle install
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'bundle clean' -- bundle clean
|
||||
|
||||
- name: Setup Acceptance Test Matrix
|
||||
id: get-matrix
|
||||
if: ${{ github.repository_owner == 'puppetlabs' }}
|
||||
run: |
|
||||
if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
|
||||
buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata
|
||||
else
|
||||
echo "::set-output name=matrix::{}"
|
||||
fi
|
||||
|
||||
- name: "Honeycomb: Record setup time"
|
||||
if: ${{ always() }}
|
||||
run: |
|
||||
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
|
||||
|
||||
Acceptance:
|
||||
needs:
|
||||
- setup_matrix
|
||||
|
||||
runs-on: ubuntu-20.04
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}}
|
||||
|
||||
env:
|
||||
BUILDEVENT_FILE: '../buildevents.txt'
|
||||
|
||||
steps:
|
||||
- run: |
|
||||
echo 'platform=${{ matrix.platform }}' >> $BUILDEVENT_FILE
|
||||
echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
|
||||
|
||||
- name: "Honeycomb: Start recording"
|
||||
uses: kvrhdn/gha-buildevents@v1.0.2
|
||||
with:
|
||||
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
|
||||
dataset: ${{ env.HONEYCOMB_DATASET }}
|
||||
job-status: ${{ job.status }}
|
||||
matrix-key: ${{ matrix.platform }}-${{ matrix.collection }}
|
||||
|
||||
- name: "Honeycomb: start first step"
|
||||
run: |
|
||||
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
|
||||
echo STEP_START=$(date +%s) >> $GITHUB_ENV
|
||||
|
||||
- name: Checkout Source
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Activate Ruby 2.7
|
||||
uses: actions/setup-ruby@v1
|
||||
with:
|
||||
ruby-version: "2.7"
|
||||
|
||||
- name: Cache gems
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
path: vendor/gems
|
||||
key: ${{ runner.os }}-${{ github.event_name }}-${{ hashFiles('**/Gemfile') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-${{ github.event_name }}-
|
||||
${{ runner.os }}-
|
||||
|
||||
- name: "Honeycomb: Record cache setup time"
|
||||
if: ${{ always() }}
|
||||
run: |
|
||||
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Cache retrieval'
|
||||
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
|
||||
echo STEP_START=$(date +%s) >> $GITHUB_ENV
|
||||
|
||||
- name: Bundler Setup
|
||||
run: |
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'bundle config path vendor/gems' -- bundle config path vendor/gems
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'bundle config jobs 8' -- bundle config jobs 8
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'bundle config retry 3' -- bundle config retry 3
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'bundle install' -- bundle install
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'bundle clean' -- bundle clean
|
||||
echo ::group::bundler environment
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
|
||||
echo ::endgroup::
|
||||
|
||||
- name: "Honeycomb: Record Bundler Setup time"
|
||||
if: ${{ always() }}
|
||||
run: |
|
||||
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Bundler Setup'
|
||||
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
|
||||
echo STEP_START=$(date +%s) >> $GITHUB_ENV
|
||||
|
||||
- name: Provision test environment
|
||||
run: |
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platform }}' -- bundle exec rake 'litmus:provision[provision::provision_service,${{ matrix.platform }}]'
|
||||
echo ::group::=== REQUEST ===
|
||||
cat request.json || true
|
||||
echo
|
||||
echo ::endgroup::
|
||||
echo ::group::=== INVENTORY ===
|
||||
sed -e 's/password: .*/password: "[redacted]"/' < inventory.yaml || true
|
||||
echo ::endgroup::
|
||||
|
||||
# The provision service hands out machines as soon as they're provisioned.
|
||||
# The GCP VMs might still take a while to spool up and configure themselves fully.
|
||||
# This retry loop spins until all agents have been installed successfully.
|
||||
- name: Install agent
|
||||
uses: nick-invision/retry@v1
|
||||
with:
|
||||
timeout_minutes: 30
|
||||
max_attempts: 5
|
||||
retry_wait_seconds: 60
|
||||
command: buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
|
||||
|
||||
# The agent installer on windows does not finish in time for this to work. To
|
||||
# work around this for now, retry after a minute if installing the module failed.
|
||||
- name: Install module
|
||||
uses: nick-invision/retry@v1
|
||||
with:
|
||||
timeout_minutes: 30
|
||||
max_attempts: 2
|
||||
retry_wait_seconds: 60
|
||||
command: buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
|
||||
|
||||
- name: "Honeycomb: Record deployment times"
|
||||
if: ${{ always() }}
|
||||
run: |
|
||||
echo ::group::honeycomb step
|
||||
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system'
|
||||
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
|
||||
echo STEP_START=$(date +%s) >> $GITHUB_ENV
|
||||
echo ::endgroup::
|
||||
|
||||
- name: Run acceptance tests
|
||||
run: |
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:acceptance:parallel' -- bundle exec rake 'litmus:acceptance:parallel'
|
||||
|
||||
- name: "Honeycomb: Record acceptance testing times"
|
||||
if: ${{ always() }}
|
||||
run: |
|
||||
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests'
|
||||
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-5 >> $GITHUB_ENV
|
||||
echo STEP_START=$(date +%s) >> $GITHUB_ENV
|
||||
|
||||
- name: Remove test environment
|
||||
if: ${{ always() }}
|
||||
run: |
|
||||
if [ -f inventory.yaml ]; then
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:tear_down' -- bundle exec rake 'litmus:tear_down'
|
||||
echo ::group::=== REQUEST ===
|
||||
cat request.json || true
|
||||
echo
|
||||
echo ::endgroup::
|
||||
fi
|
||||
|
||||
- name: "Honeycomb: Record removal times"
|
||||
if: ${{ always() }}
|
||||
run: |
|
||||
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Remove test environment'
|
||||
71
.github/workflows/release.yml
vendored
71
.github/workflows/release.yml
vendored
@@ -1,71 +0,0 @@
|
||||
name: "release"
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- 'release'
|
||||
|
||||
jobs:
|
||||
LitmusAcceptancePuppet5:
|
||||
env:
|
||||
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
|
||||
HONEYCOMB_DATASET: litmus tests
|
||||
runs-on: self-hosted
|
||||
strategy:
|
||||
matrix:
|
||||
ruby_version: [2.5.x]
|
||||
puppet_gem_version: [~> 6.0]
|
||||
platform: [release_checks_5]
|
||||
agent_family: ['puppet5']
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
- name: Litmus Parallel
|
||||
uses: puppetlabs/action-litmus_parallel@main
|
||||
with:
|
||||
platform: ${{ matrix.platform }}
|
||||
agent_family: ${{ matrix.agent_family }}
|
||||
LitmusAcceptancePuppet6:
|
||||
env:
|
||||
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
|
||||
HONEYCOMB_DATASET: litmus tests
|
||||
runs-on: self-hosted
|
||||
strategy:
|
||||
matrix:
|
||||
ruby_version: [2.5.x]
|
||||
puppet_gem_version: [~> 6.0]
|
||||
platform: [release_checks_6]
|
||||
agent_family: ['puppet6']
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
- name: Litmus Parallel
|
||||
uses: puppetlabs/action-litmus_parallel@main
|
||||
with:
|
||||
platform: ${{ matrix.platform }}
|
||||
agent_family: ${{ matrix.agent_family }}
|
||||
|
||||
Spec:
|
||||
runs-on: self-hosted
|
||||
|
||||
strategy:
|
||||
matrix:
|
||||
check: [spec, 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop']
|
||||
ruby_version: [2.4.x, 2.5.x]
|
||||
puppet_gem_version: [~> 5.0, ~> 6.0]
|
||||
exclude:
|
||||
- puppet_gem_version: ~> 5.0
|
||||
check: 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop'
|
||||
- ruby_version: 2.4.x
|
||||
puppet_gem_version: ~> 6.0
|
||||
- ruby_version: 2.5.x
|
||||
puppet_gem_version: ~> 5.0
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
|
||||
- name: Spec Tests
|
||||
uses: puppetlabs/action-litmus_spec@main
|
||||
with:
|
||||
puppet_gem_versionm: ${{ matrix.puppet_gem_version }}
|
||||
check: ${{ matrix.check }}
|
||||
64
.github/workflows/weekly.yml
vendored
64
.github/workflows/weekly.yml
vendored
@@ -1,64 +0,0 @@
|
||||
name: "weekly"
|
||||
|
||||
on:
|
||||
schedule:
|
||||
- cron: '0 5 * * 5'
|
||||
|
||||
jobs:
|
||||
LitmusAcceptancePuppet5:
|
||||
env:
|
||||
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
|
||||
HONEYCOMB_DATASET: litmus tests
|
||||
runs-on: self-hosted
|
||||
strategy:
|
||||
matrix:
|
||||
ruby_version: [2.5.x]
|
||||
puppet_gem_version: [~> 6.0]
|
||||
platform: [release_checks_5]
|
||||
agent_family: ['puppet5']
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
- name: Litmus Parallel
|
||||
uses: puppetlabs/action-litmus_parallel@main
|
||||
with:
|
||||
platform: ${{ matrix.platform }}
|
||||
agent_family: ${{ matrix.agent_family }}
|
||||
LitmusAcceptancePuppet6:
|
||||
env:
|
||||
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
|
||||
HONEYCOMB_DATASET: litmus tests
|
||||
runs-on: self-hosted
|
||||
strategy:
|
||||
matrix:
|
||||
ruby_version: [2.5.x]
|
||||
puppet_gem_version: [~> 6.0]
|
||||
platform: [release_checks_6]
|
||||
agent_family: ['puppet6']
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
- name: Litmus Parallel
|
||||
uses: puppetlabs/action-litmus_parallel@main
|
||||
with:
|
||||
platform: ${{ matrix.platform }}
|
||||
agent_family: ${{ matrix.agent_family }}
|
||||
Spec:
|
||||
runs-on: self-hosted
|
||||
strategy:
|
||||
matrix:
|
||||
check: [parallel_spec, 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop']
|
||||
ruby_version: [2.5.x]
|
||||
puppet_gem_version: [~> 5.0, ~> 6.0]
|
||||
exclude:
|
||||
- puppet_gem_version: ~> 5.0
|
||||
check: 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop'
|
||||
- ruby_version: 2.5.x
|
||||
puppet_gem_version: ~> 5.0
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
- name: Spec Tests
|
||||
uses: puppetlabs/action-litmus_spec@main
|
||||
with:
|
||||
puppet_gem_version: ${{ matrix.puppet_gem_version }}
|
||||
check: ${{ matrix.check }}
|
||||
18
.gitpod.Dockerfile
vendored
Normal file
18
.gitpod.Dockerfile
vendored
Normal file
@@ -0,0 +1,18 @@
|
||||
FROM gitpod/workspace-full
|
||||
RUN sudo wget https://apt.puppet.com/puppet-tools-release-bionic.deb && \
|
||||
wget https://apt.puppetlabs.com/puppet6-release-bionic.deb && \
|
||||
sudo dpkg -i puppet6-release-bionic.deb && \
|
||||
sudo dpkg -i puppet-tools-release-bionic.deb && \
|
||||
sudo apt-get update && \
|
||||
sudo apt-get install -y pdk zsh puppet-agent && \
|
||||
sudo apt-get clean && \
|
||||
sudo rm -rf /var/lib/apt/lists/*
|
||||
RUN sudo usermod -s $(which zsh) gitpod && \
|
||||
sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" && \
|
||||
echo "plugins=(git gitignore github gem pip bundler python ruby docker docker-compose)" >> /home/gitpod/.zshrc && \
|
||||
echo 'PATH="$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/opt/puppetlabs/bin:/opt/puppetlabs/puppet/bin"' >> /home/gitpod/.zshrc && \
|
||||
sudo /opt/puppetlabs/puppet/bin/gem install puppet-debugger hub -N && \
|
||||
mkdir -p /home/gitpod/.config/puppet && \
|
||||
/opt/puppetlabs/puppet/bin/ruby -r yaml -e "puts ({'disabled' => true}).to_yaml" > /home/gitpod/.config/puppet/analytics.yml
|
||||
RUN rm -f puppet6-release-bionic.deb puppet-tools-release-bionic.deb
|
||||
ENTRYPOINT /usr/bin/zsh
|
||||
9
.gitpod.yml
Normal file
9
.gitpod.yml
Normal file
@@ -0,0 +1,9 @@
|
||||
image:
|
||||
file: .gitpod.Dockerfile
|
||||
|
||||
tasks:
|
||||
- init: pdk bundle install
|
||||
|
||||
vscode:
|
||||
extensions:
|
||||
- puppet.puppet-vscode@1.0.0:oSzfTkDf6Cmc1jOjgW33VA==
|
||||
@@ -32,6 +32,7 @@
|
||||
/.gitignore
|
||||
/.gitlab-ci.yml
|
||||
/.pdkignore
|
||||
/.puppet-lint.rc
|
||||
/Rakefile
|
||||
/rakelib/
|
||||
/.rspec
|
||||
@@ -40,3 +41,4 @@
|
||||
/.yardopts
|
||||
/spec/
|
||||
/.vscode/
|
||||
/.sync.yml
|
||||
|
||||
@@ -43,7 +43,7 @@ Style/BlockDelimiters:
|
||||
Style/BracesAroundHashParameters:
|
||||
Description: Braces are required by Ruby 2.7. Cop removed from RuboCop v0.80.0.
|
||||
See https://github.com/rubocop-hq/rubocop/pull/7643
|
||||
Enabled: true
|
||||
Enabled: false
|
||||
Style/ClassAndModuleChildren:
|
||||
Description: Compact style reduces the required amount of indentation.
|
||||
EnforcedStyle: compact
|
||||
|
||||
16
.sync.yml
16
.sync.yml
@@ -13,7 +13,6 @@
|
||||
provision_list:
|
||||
- ---travis_el
|
||||
- travis_deb
|
||||
- travis_el6
|
||||
- travis_el7
|
||||
- travis_el8
|
||||
complex:
|
||||
@@ -40,6 +39,21 @@ Gemfile:
|
||||
git: https://github.com/skywinder/github-changelog-generator
|
||||
ref: 20ee04ba1234e9e83eb2ffb5056e23d641c7a018
|
||||
condition: Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
|
||||
- gem: puppet_litmus
|
||||
git: https://github.com/puppetlabs/puppet_litmus
|
||||
ref: main
|
||||
condition: Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.5.0')
|
||||
- gem: bolt
|
||||
version: '2.32.0'
|
||||
condition: Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.5.0')
|
||||
spec/spec_helper.rb:
|
||||
mock_with: ":rspec"
|
||||
coverage_report: true
|
||||
.gitpod.Dockerfile:
|
||||
unmanaged: false
|
||||
.gitpod.yml:
|
||||
unmanaged: false
|
||||
.github/workflows/nightly.yml:
|
||||
unmanaged: false
|
||||
.github/workflows/pr_test.yml:
|
||||
unmanaged: false
|
||||
|
||||
22
.travis.yml
22
.travis.yml
@@ -60,17 +60,6 @@ jobs:
|
||||
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
|
||||
services: docker
|
||||
stage: acceptance
|
||||
-
|
||||
before_script:
|
||||
- "bundle exec rake 'litmus:provision_list[travis_el6]'"
|
||||
- "bundle exec rake 'litmus:install_agent[puppet5]'"
|
||||
- "bundle exec rake litmus:install_module"
|
||||
bundler_args:
|
||||
env: PLATFORMS=travis_el6_puppet5
|
||||
rvm: 2.5.7
|
||||
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
|
||||
services: docker
|
||||
stage: acceptance
|
||||
-
|
||||
before_script:
|
||||
- "bundle exec rake 'litmus:provision_list[travis_el7]'"
|
||||
@@ -104,17 +93,6 @@ jobs:
|
||||
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
|
||||
services: docker
|
||||
stage: acceptance
|
||||
-
|
||||
before_script:
|
||||
- "bundle exec rake 'litmus:provision_list[travis_el6]'"
|
||||
- "bundle exec rake 'litmus:install_agent[puppet6]'"
|
||||
- "bundle exec rake litmus:install_module"
|
||||
bundler_args:
|
||||
env: PLATFORMS=travis_el6_puppet6
|
||||
rvm: 2.5.7
|
||||
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
|
||||
services: docker
|
||||
stage: acceptance
|
||||
-
|
||||
before_script:
|
||||
- "bundle exec rake 'litmus:provision_list[travis_el7]'"
|
||||
|
||||
12
CHANGELOG.md
12
CHANGELOG.md
@@ -2,9 +2,17 @@
|
||||
|
||||
All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
|
||||
|
||||
## [v6.4.0](https://github.com/puppetlabs/puppetlabs-java/tree/v6.3.0) (2020-11-09)
|
||||
## [v6.5.0](https://github.com/puppetlabs/puppetlabs-java/tree/v6.5.0) (2020-12-16)
|
||||
|
||||
[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v6.3.0...v6.3.0)
|
||||
[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v6.4.0...v6.5.0)
|
||||
|
||||
### Added
|
||||
|
||||
- pdksync - \(feat\) Add support for Puppet 7 [\#454](https://github.com/puppetlabs/puppetlabs-java/pull/454) ([daianamezdrea](https://github.com/daianamezdrea))
|
||||
|
||||
## [v6.4.0](https://github.com/puppetlabs/puppetlabs-java/tree/v6.4.0) (2020-11-09)
|
||||
|
||||
[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v6.3.0...v6.4.0)
|
||||
|
||||
### Added
|
||||
|
||||
|
||||
3
Gemfile
3
Gemfile
@@ -23,12 +23,15 @@ group :development do
|
||||
gem "json", '= 1.8.1', require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')
|
||||
gem "json", '= 2.0.4', require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
|
||||
gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
|
||||
gem "json", '= 2.3.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 2.8.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
|
||||
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
|
||||
gem "puppet-module-posix-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:ruby]
|
||||
gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:ruby]
|
||||
gem "puppet-module-win-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw]
|
||||
gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw]
|
||||
gem "github_changelog_generator", require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
|
||||
gem "puppet_litmus", require: false, git: 'https://github.com/puppetlabs/puppet_litmus', ref: 'main' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.5.0')
|
||||
gem "bolt", '2.32.0', require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.5.0')
|
||||
end
|
||||
|
||||
puppet_version = ENV['PUPPET_GEM_VERSION']
|
||||
|
||||
107
REFERENCE.md
107
REFERENCE.md
@@ -1,22 +1,23 @@
|
||||
# Reference
|
||||
|
||||
<!-- DO NOT EDIT: This document was generated by Puppet Strings -->
|
||||
|
||||
## Table of Contents
|
||||
|
||||
**Classes**
|
||||
### Classes
|
||||
|
||||
_Public Classes_
|
||||
#### Public Classes
|
||||
|
||||
* [`java`](#java): This module manages the Java runtime package
|
||||
|
||||
_Private Classes_
|
||||
#### Private Classes
|
||||
|
||||
* `java::config`:
|
||||
* `java::config`
|
||||
* `java::params`: This class builds a hash of JDK/JRE packages and (for Debian)
|
||||
alternatives. For wheezy/precise, we provide Oracle JDK/JRE
|
||||
options, even though those are not in the package repositories.
|
||||
|
||||
**Defined types**
|
||||
### Defined types
|
||||
|
||||
* [`java::adopt`](#javaadopt): Install one or more versions of AdoptOpenJDK Java.
|
||||
* [`java::download`](#javadownload): Installs Java from a url location.
|
||||
@@ -24,7 +25,7 @@ options, even though those are not in the package repositories.
|
||||
|
||||
## Classes
|
||||
|
||||
### java
|
||||
### `java`
|
||||
|
||||
This module manages the Java runtime package
|
||||
|
||||
@@ -40,7 +41,7 @@ The java distribution to install. Can be one of "jdk" or "jre",
|
||||
or other platform-specific options where there are multiple
|
||||
implementations available (eg: OpenJDK vs Oracle JDK).
|
||||
|
||||
Default value: 'jdk'
|
||||
Default value: `'jdk'`
|
||||
|
||||
##### `version`
|
||||
|
||||
@@ -49,7 +50,7 @@ Data type: `Pattern[/present|installed|latest|^[.+_0-9a-zA-Z:~-]+$/]`
|
||||
The version of java to install. By default, this module simply ensures
|
||||
that java is present, and does not require a specific version.
|
||||
|
||||
Default value: 'present'
|
||||
Default value: `'present'`
|
||||
|
||||
##### `package`
|
||||
|
||||
@@ -58,7 +59,7 @@ Data type: `Optional[String]`
|
||||
The name of the java package. This is configurable in case a non-standard
|
||||
java package is desired.
|
||||
|
||||
Default value: `undef`
|
||||
Default value: ``undef``
|
||||
|
||||
##### `package_options`
|
||||
|
||||
@@ -67,7 +68,7 @@ Data type: `Optional[Array]`
|
||||
Array of strings to pass installation options to the 'package' Puppet resource.
|
||||
Options available depend on the 'package' provider for the target OS.
|
||||
|
||||
Default value: `undef`
|
||||
Default value: ``undef``
|
||||
|
||||
##### `java_alternative`
|
||||
|
||||
@@ -79,7 +80,7 @@ If you specify a particular package, you will almost always also
|
||||
want to specify which java_alternative to choose. If you set
|
||||
this, you also need to set the path below.
|
||||
|
||||
Default value: `undef`
|
||||
Default value: ``undef``
|
||||
|
||||
##### `java_alternative_path`
|
||||
|
||||
@@ -90,7 +91,7 @@ alternatives system makes it difficult to verify which
|
||||
alternative is actually enabled, this is required to ensure the
|
||||
correct JVM is enabled.
|
||||
|
||||
Default value: `undef`
|
||||
Default value: ``undef``
|
||||
|
||||
##### `java_home`
|
||||
|
||||
@@ -99,11 +100,11 @@ Data type: `Optional[String]`
|
||||
The path to where the JRE is installed. This will be set as an
|
||||
environment variable.
|
||||
|
||||
Default value: `undef`
|
||||
Default value: ``undef``
|
||||
|
||||
## Defined types
|
||||
|
||||
### java::adopt
|
||||
### `java::adopt`
|
||||
|
||||
Defined Type java::adopt
|
||||
|
||||
@@ -117,7 +118,7 @@ Data type: `Any`
|
||||
|
||||
Install or remove the package.
|
||||
|
||||
Default value: 'present'
|
||||
Default value: `'present'`
|
||||
|
||||
##### `version`
|
||||
|
||||
@@ -125,7 +126,7 @@ Data type: `Any`
|
||||
|
||||
Version of Java to install, e.g. '8' or '9'. Default values for major and minor versions will be used.
|
||||
|
||||
Default value: '8'
|
||||
Default value: `'8'`
|
||||
|
||||
##### `version_major`
|
||||
|
||||
@@ -133,7 +134,7 @@ Data type: `Any`
|
||||
|
||||
Major version which should be installed, e.g. '8u101' or '9.0.4'. Must be used together with version_minor.
|
||||
|
||||
Default value: `undef`
|
||||
Default value: ``undef``
|
||||
|
||||
##### `version_minor`
|
||||
|
||||
@@ -141,7 +142,7 @@ Data type: `Any`
|
||||
|
||||
Minor version which should be installed, e.g. 'b12' (for version = '8') or '11' (for version != '8'). Must be used together with version_major.
|
||||
|
||||
Default value: `undef`
|
||||
Default value: ``undef``
|
||||
|
||||
##### `java`
|
||||
|
||||
@@ -149,7 +150,7 @@ Data type: `Any`
|
||||
|
||||
Type of Java Standard Edition to install, jdk or jre.
|
||||
|
||||
Default value: 'jdk'
|
||||
Default value: `'jdk'`
|
||||
|
||||
##### `proxy_server`
|
||||
|
||||
@@ -157,7 +158,7 @@ Data type: `Any`
|
||||
|
||||
Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive)
|
||||
|
||||
Default value: `undef`
|
||||
Default value: ``undef``
|
||||
|
||||
##### `proxy_type`
|
||||
|
||||
@@ -165,7 +166,7 @@ Data type: `Any`
|
||||
|
||||
Proxy server type (none|http|https|ftp). (passed to archive)
|
||||
|
||||
Default value: `undef`
|
||||
Default value: ``undef``
|
||||
|
||||
##### `basedir`
|
||||
|
||||
@@ -174,7 +175,7 @@ Data type: `Any`
|
||||
Directory under which the installation will occur. If not set, defaults to
|
||||
/usr/lib/jvm for Debian and /usr/java for RedHat.
|
||||
|
||||
Default value: `undef`
|
||||
Default value: ``undef``
|
||||
|
||||
##### `manage_basedir`
|
||||
|
||||
@@ -183,7 +184,7 @@ Data type: `Any`
|
||||
Whether to manage the basedir directory. Defaults to false.
|
||||
Note: /usr/lib/jvm is managed for Debian by default, separate from this parameter.
|
||||
|
||||
Default value: `true`
|
||||
Default value: ``true``
|
||||
|
||||
##### `package_type`
|
||||
|
||||
@@ -193,7 +194,7 @@ Type of installation package for specified version of java_se. java_se 6 comes
|
||||
in a few installation package flavors and we need to account for them.
|
||||
Optional forced package types: rpm, rpmbin, tar.gz
|
||||
|
||||
Default value: `undef`
|
||||
Default value: ``undef``
|
||||
|
||||
##### `manage_symlink`
|
||||
|
||||
@@ -201,7 +202,7 @@ Data type: `Any`
|
||||
|
||||
Whether to manage a symlink that points to the installation directory. Defaults to false.
|
||||
|
||||
Default value: `false`
|
||||
Default value: ``false``
|
||||
|
||||
##### `symlink_name`
|
||||
|
||||
@@ -209,9 +210,9 @@ Data type: `Any`
|
||||
|
||||
The name for the optional symlink in the installation directory.
|
||||
|
||||
Default value: `undef`
|
||||
Default value: ``undef``
|
||||
|
||||
### java::download
|
||||
### `java::download`
|
||||
|
||||
Defined Type java::download
|
||||
|
||||
@@ -225,7 +226,7 @@ Data type: `Any`
|
||||
|
||||
Install or remove the package.
|
||||
|
||||
Default value: 'present'
|
||||
Default value: `'present'`
|
||||
|
||||
##### `version`
|
||||
|
||||
@@ -233,7 +234,7 @@ Data type: `Any`
|
||||
|
||||
Version of Java to install, e.g. '7' or '8'. Default values for major and minor versions will be used.
|
||||
|
||||
Default value: '8'
|
||||
Default value: `'8'`
|
||||
|
||||
##### `version_major`
|
||||
|
||||
@@ -241,7 +242,7 @@ Data type: `Any`
|
||||
|
||||
Major version which should be installed, e.g. '8u101'. Must be used together with version_minor.
|
||||
|
||||
Default value: `undef`
|
||||
Default value: ``undef``
|
||||
|
||||
##### `version_minor`
|
||||
|
||||
@@ -249,7 +250,7 @@ Data type: `Any`
|
||||
|
||||
Minor version which should be installed, e.g. 'b12'. Must be used together with version_major.
|
||||
|
||||
Default value: `undef`
|
||||
Default value: ``undef``
|
||||
|
||||
##### `java_se`
|
||||
|
||||
@@ -257,7 +258,7 @@ Data type: `Any`
|
||||
|
||||
Type of Java Standard Edition to install, jdk or jre.
|
||||
|
||||
Default value: 'jdk'
|
||||
Default value: `'jdk'`
|
||||
|
||||
##### `proxy_server`
|
||||
|
||||
@@ -265,7 +266,7 @@ Data type: `Any`
|
||||
|
||||
Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive)
|
||||
|
||||
Default value: `undef`
|
||||
Default value: ``undef``
|
||||
|
||||
##### `proxy_type`
|
||||
|
||||
@@ -273,7 +274,7 @@ Data type: `Any`
|
||||
|
||||
Proxy server type (none|http|https|ftp). (passed to archive)
|
||||
|
||||
Default value: `undef`
|
||||
Default value: ``undef``
|
||||
|
||||
##### `url`
|
||||
|
||||
@@ -281,7 +282,7 @@ Data type: `Any`
|
||||
|
||||
Full URL
|
||||
|
||||
Default value: `undef`
|
||||
Default value: ``undef``
|
||||
|
||||
##### `jce`
|
||||
|
||||
@@ -289,7 +290,7 @@ Data type: `Any`
|
||||
|
||||
Install Oracles Java Cryptographic Extensions into the JRE or JDK
|
||||
|
||||
Default value: `false`
|
||||
Default value: ``false``
|
||||
|
||||
##### `jce_url`
|
||||
|
||||
@@ -297,7 +298,7 @@ Data type: `Any`
|
||||
|
||||
Full URL to the jce zip file
|
||||
|
||||
Default value: `undef`
|
||||
Default value: ``undef``
|
||||
|
||||
##### `basedir`
|
||||
|
||||
@@ -306,7 +307,7 @@ Data type: `Any`
|
||||
Directory under which the installation will occur. If not set, defaults to
|
||||
/usr/lib/jvm for Debian and /usr/java for RedHat.
|
||||
|
||||
Default value: `undef`
|
||||
Default value: ``undef``
|
||||
|
||||
##### `manage_basedir`
|
||||
|
||||
@@ -315,7 +316,7 @@ Data type: `Any`
|
||||
Whether to manage the basedir directory. Defaults to false.
|
||||
Note: /usr/lib/jvm is managed for Debian by default, separate from this parameter.
|
||||
|
||||
Default value: `false`
|
||||
Default value: ``false``
|
||||
|
||||
##### `package_type`
|
||||
|
||||
@@ -325,7 +326,7 @@ Type of installation package for specified version of java_se. java_se 6 comes
|
||||
in a few installation package flavors and we need to account for them.
|
||||
Optional forced package types: rpm, rpmbin, tar.gz
|
||||
|
||||
Default value: `undef`
|
||||
Default value: ``undef``
|
||||
|
||||
##### `manage_symlink`
|
||||
|
||||
@@ -333,7 +334,7 @@ Data type: `Any`
|
||||
|
||||
Whether to manage a symlink that points to the installation directory. Defaults to false.
|
||||
|
||||
Default value: `false`
|
||||
Default value: ``false``
|
||||
|
||||
##### `symlink_name`
|
||||
|
||||
@@ -341,9 +342,9 @@ Data type: `Any`
|
||||
|
||||
The name for the optional symlink in the installation directory.
|
||||
|
||||
Default value: `undef`
|
||||
Default value: ``undef``
|
||||
|
||||
### java::sap
|
||||
### `java::sap`
|
||||
|
||||
Defined Type java::sap
|
||||
|
||||
@@ -357,7 +358,7 @@ Data type: `Any`
|
||||
|
||||
Install or remove the package.
|
||||
|
||||
Default value: 'present'
|
||||
Default value: `'present'`
|
||||
|
||||
##### `version`
|
||||
|
||||
@@ -365,7 +366,7 @@ Data type: `Any`
|
||||
|
||||
Version of Java to install, e.g. '8' or '9'. Default values for full versions will be used.
|
||||
|
||||
Default value: '8'
|
||||
Default value: `'8'`
|
||||
|
||||
##### `version_full`
|
||||
|
||||
@@ -373,7 +374,7 @@ Data type: `Any`
|
||||
|
||||
Major version which should be installed, e.g. '8.1.063' or '11.0.7'. If used, "version" parameter is ignored.
|
||||
|
||||
Default value: `undef`
|
||||
Default value: ``undef``
|
||||
|
||||
##### `java`
|
||||
|
||||
@@ -381,7 +382,7 @@ Data type: `Any`
|
||||
|
||||
Type of Java Edition to install, jdk or jre.
|
||||
|
||||
Default value: 'jdk'
|
||||
Default value: `'jdk'`
|
||||
|
||||
##### `proxy_server`
|
||||
|
||||
@@ -389,7 +390,7 @@ Data type: `Any`
|
||||
|
||||
Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive)
|
||||
|
||||
Default value: `undef`
|
||||
Default value: ``undef``
|
||||
|
||||
##### `proxy_type`
|
||||
|
||||
@@ -397,7 +398,7 @@ Data type: `Any`
|
||||
|
||||
Proxy server type (none|http|https|ftp). (passed to archive)
|
||||
|
||||
Default value: `undef`
|
||||
Default value: ``undef``
|
||||
|
||||
##### `basedir`
|
||||
|
||||
@@ -406,7 +407,7 @@ Data type: `Any`
|
||||
Directory under which the installation will occur. If not set, defaults to
|
||||
/usr/lib/jvm for Debian and /usr/java for RedHat.
|
||||
|
||||
Default value: `undef`
|
||||
Default value: ``undef``
|
||||
|
||||
##### `manage_basedir`
|
||||
|
||||
@@ -415,7 +416,7 @@ Data type: `Any`
|
||||
Whether to manage the basedir directory. Defaults to false.
|
||||
Note: /usr/lib/jvm is managed for Debian by default, separate from this parameter.
|
||||
|
||||
Default value: `true`
|
||||
Default value: ``true``
|
||||
|
||||
##### `manage_symlink`
|
||||
|
||||
@@ -423,7 +424,7 @@ Data type: `Any`
|
||||
|
||||
Whether to manage a symlink that points to the installation directory. Defaults to false.
|
||||
|
||||
Default value: `false`
|
||||
Default value: ``false``
|
||||
|
||||
##### `symlink_name`
|
||||
|
||||
@@ -431,5 +432,5 @@ Data type: `Any`
|
||||
|
||||
The name for the optional symlink in the installation directory.
|
||||
|
||||
Default value: `undef`
|
||||
Default value: ``undef``
|
||||
|
||||
|
||||
1
data/common.yaml
Normal file
1
data/common.yaml
Normal file
@@ -0,0 +1 @@
|
||||
--- {}
|
||||
21
hiera.yaml
Normal file
21
hiera.yaml
Normal file
@@ -0,0 +1,21 @@
|
||||
---
|
||||
version: 5
|
||||
|
||||
defaults: # Used for any hierarchy level that omits these keys.
|
||||
datadir: data # This path is relative to hiera.yaml's directory.
|
||||
data_hash: yaml_data # Use the built-in YAML backend.
|
||||
|
||||
hierarchy:
|
||||
- name: "osfamily/major release"
|
||||
paths:
|
||||
# Used to distinguish between Debian and Ubuntu
|
||||
- "os/%{facts.os.name}/%{facts.os.release.major}.yaml"
|
||||
- "os/%{facts.os.family}/%{facts.os.release.major}.yaml"
|
||||
# Used for Solaris
|
||||
- "os/%{facts.os.family}/%{facts.kernelrelease}.yaml"
|
||||
- name: "osfamily"
|
||||
paths:
|
||||
- "os/%{facts.os.name}.yaml"
|
||||
- "os/%{facts.os.family}.yaml"
|
||||
- name: 'common'
|
||||
path: 'common.yaml'
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "puppetlabs-java",
|
||||
"version": "6.4.0",
|
||||
"version": "6.5.0",
|
||||
"author": "puppetlabs",
|
||||
"summary": "Installs the correct Java package on various platforms.",
|
||||
"license": "Apache-2.0",
|
||||
@@ -78,10 +78,10 @@
|
||||
"requirements": [
|
||||
{
|
||||
"name": "puppet",
|
||||
"version_requirement": ">= 5.5.10 < 7.0.0"
|
||||
"version_requirement": ">= 5.5.10 < 8.0.0"
|
||||
}
|
||||
],
|
||||
"template-url": "https://github.com/puppetlabs/pdk-templates#main",
|
||||
"template-ref": "heads/main-0-gd610ead",
|
||||
"template-ref": "heads/main-0-g5afcd3d",
|
||||
"pdk-version": "1.18.1"
|
||||
}
|
||||
|
||||
@@ -1,32 +1,96 @@
|
||||
---
|
||||
default:
|
||||
provisioner: docker
|
||||
images: ['litmusimage/debian:8']
|
||||
provisioner: docker
|
||||
images:
|
||||
- litmusimage/debian:8
|
||||
vagrant:
|
||||
provisioner: vagrant
|
||||
images: ['centos/7', 'generic/ubuntu1804']
|
||||
images:
|
||||
- centos/7
|
||||
- generic/ubuntu1804
|
||||
travis_deb:
|
||||
provisioner: docker
|
||||
images: ['litmusimage/debian:8', 'litmusimage/debian:9', 'litmusimage/debian:10']
|
||||
images:
|
||||
- litmusimage/debian:8
|
||||
- litmusimage/debian:9
|
||||
- litmusimage/debian:10
|
||||
travis_ub_5:
|
||||
provisioner: docker
|
||||
images: ['litmusimage/ubuntu:14.04', 'litmusimage/ubuntu:16.04', 'litmusimage/ubuntu:18.04']
|
||||
images:
|
||||
- litmusimage/ubuntu:14.04
|
||||
- litmusimage/ubuntu:16.04
|
||||
- litmusimage/ubuntu:18.04
|
||||
travis_ub_6:
|
||||
provisioner: docker
|
||||
images: ['litmusimage/ubuntu:14.04', 'litmusimage/ubuntu:16.04', 'litmusimage/ubuntu:18.04', 'litmusimage/ubuntu:20.04']
|
||||
travis_el6:
|
||||
provisioner: docker
|
||||
images: ['litmusimage/centos:6', 'litmusimage/oraclelinux:6', 'litmusimage/scientificlinux:6']
|
||||
images:
|
||||
- litmusimage/ubuntu:14.04
|
||||
- litmusimage/ubuntu:16.04
|
||||
- litmusimage/ubuntu:18.04
|
||||
- litmusimage/ubuntu:20.04
|
||||
travis_el7:
|
||||
provisioner: docker
|
||||
images: ['litmusimage/centos:7', 'litmusimage/oraclelinux:7', 'litmusimage/scientificlinux:7']
|
||||
images:
|
||||
- litmusimage/centos:7
|
||||
- litmusimage/oraclelinux:7
|
||||
- litmusimage/scientificlinux:7
|
||||
travis_el8:
|
||||
provisioner: docker
|
||||
images: ['litmusimage/centos:8']
|
||||
images:
|
||||
- litmusimage/centos:8
|
||||
release_checks_5:
|
||||
provisioner: abs
|
||||
images: ['redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-6-x86_64', 'centos-7-x86_64', 'centos-8-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64', 'debian-10-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'sles-12-x86_64', 'sles-15-x86_64']
|
||||
images:
|
||||
- redhat-6-x86_64
|
||||
- redhat-7-x86_64
|
||||
- redhat-8-x86_64
|
||||
- centos-6-x86_64
|
||||
- centos-7-x86_64
|
||||
- centos-8-x86_64
|
||||
- oracle-6-x86_64
|
||||
- oracle-7-x86_64
|
||||
- scientific-6-x86_64
|
||||
- scientific-7-x86_64
|
||||
- debian-8-x86_64
|
||||
- debian-9-x86_64
|
||||
- debian-10-x86_64
|
||||
- ubuntu-1404-x86_64
|
||||
- ubuntu-1604-x86_64
|
||||
- ubuntu-1804-x86_64
|
||||
- sles-12-x86_64
|
||||
- sles-15-x86_64
|
||||
release_checks_6:
|
||||
provisioner: abs
|
||||
images: ['redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-6-x86_64', 'centos-7-x86_64', 'centos-8-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64', 'debian-10-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'ubuntu-2004-x86_64', 'sles-12-x86_64', 'sles-15-x86_64']
|
||||
|
||||
images:
|
||||
- redhat-6-x86_64
|
||||
- redhat-7-x86_64
|
||||
- redhat-8-x86_64
|
||||
- centos-6-x86_64
|
||||
- centos-7-x86_64
|
||||
- centos-8-x86_64
|
||||
- oracle-6-x86_64
|
||||
- oracle-7-x86_64
|
||||
- scientific-6-x86_64
|
||||
- scientific-7-x86_64
|
||||
- debian-8-x86_64
|
||||
- debian-9-x86_64
|
||||
- debian-10-x86_64
|
||||
- ubuntu-1404-x86_64
|
||||
- ubuntu-1604-x86_64
|
||||
- ubuntu-1804-x86_64
|
||||
- ubuntu-2004-x86_64
|
||||
- sles-12-x86_64
|
||||
- sles-15-x86_64
|
||||
release_checks_7:
|
||||
provisioner: abs
|
||||
images:
|
||||
- redhat-7-x86_64
|
||||
- redhat-8-x86_64
|
||||
- centos-7-x86_64
|
||||
- centos-8-x86_64
|
||||
- oracle-7-x86_64
|
||||
- debian-9-x86_64
|
||||
- debian-10-x86_64
|
||||
- ubuntu-1804-x86_64
|
||||
- ubuntu-2004-x86_64
|
||||
- sles-12-x86_64
|
||||
- sles-15-x86_64
|
||||
|
||||
Reference in New Issue
Block a user