Skip to content

Commit fca911f

Browse files
tylerjltylerjl
committed
Merge branch 'master' into hiera-plugindir-call
2 parents adc4cac + 96ac7b2 commit fca911f

17 files changed

+304
-48
lines changed

‎.ci/jobs/defaults.yml‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
---
2+
3+
##### GLOBAL METADATA
4+
5+
- meta:
6+
cluster: devops-ci
7+
8+
##### JOB DEFAULTS
9+
10+
- job:
11+
project-type: matrix
12+
logrotate:
13+
daysToKeep: 30
14+
numToKeep: 100
15+
parameters:
16+
- string:
17+
name: branch_specifier
18+
default: master
19+
description: the Git branch specifier to build (<branchName>, <tagName>,
20+
<commitId>, etc.)
21+
properties:
22+
- github:
23+
url: https://github.com/elastic/puppet-elasticsearch/
24+
- inject:
25+
properties-content: |-
26+
HOME=$JENKINS_HOME
27+
VAULT_PATH=secret/devops-ci/puppet-elasticsearch/xpack_license
28+
node: master
29+
scm:
30+
- git:
31+
name: origin
32+
credentials-id: f6c7695a-671e-4f4f-a331-acdce44ff9ba
33+
reference-repo: /var/lib/jenkins/.git-references/puppet-elasticsearch.git
34+
branches:
35+
- ${branch_specifier}
36+
url: https://github.com/elastic/puppet-elasticsearch.git
37+
basedir: ''
38+
wipe-workspace: 'True'
39+
triggers:
40+
- github
41+
vault:
42+
role_id: cff5d4e0-61bf-2497-645f-fcf019d10c13
43+
wrappers:
44+
- ansicolor
45+
- timeout:
46+
type: absolute
47+
timeout: 360
48+
fail: true
49+
- timestamps
50+
publishers:
51+
- email:
52+
recipients: [email protected]

‎.ci/jobs/elastic+puppet-elasticsearch+master+acceptance.yml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
---
2+
- job:
3+
name: elastic+puppet-elasticsearch+master+acceptance
4+
display-name: elastic / puppet-elasticsearch - master - acceptance
5+
description: Master - acceptance
6+
axes:
7+
- axis:
8+
type: slave
9+
name: label
10+
values:
11+
- linux
12+
- axis:
13+
name: OS
14+
filename: spec/matrix.yml
15+
type: yaml
16+
- axis:
17+
name: TEST_TYPE
18+
filename: spec/matrix.yml
19+
type: yaml
20+
builders:
21+
- shell: |-
22+
#!/usr/local/bin/runbld
23+
set -euo pipefail
24+
25+
export RBENV_VERSION='2.3.0'
26+
export PATH="$HOME/.rbenv/bin:$PATH"
27+
eval "$(rbenv init -)"
28+
rbenv local $RBENV_VERSION
29+
30+
# We need to not use [VERSION] in the matrix name since having
31+
# square brackets in the directories breaks some of the puppet tests
32+
case "$TEST_TYPE" in
33+
latest)
34+
test=acceptance
35+
;;
36+
snapshot)
37+
test=snapshot
38+
;;
39+
*)
40+
test="acceptance[$TEST_TYPE]"
41+
;;
42+
esac
43+
44+
echo '--color' >> ~/.rspec
45+
bundle install
46+
bundle exec rake "beaker:$OS:$test"

‎.ci/jobs/elastic+puppet-elasticsearch+master+intake.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
---
2+
- job:
3+
name: elastic+puppet-elasticsearch+master+intake
4+
display-name: elastic / puppet-elasticsearch - master - intake
5+
description: Master - intake
6+
axes:
7+
- axis:
8+
type: slave
9+
name: label
10+
values:
11+
- linux
12+
- axis:
13+
name: PUPPET_VERSION
14+
filename: spec/matrix.yml
15+
type: yaml
16+
builders:
17+
- shell: |-
18+
#!/usr/local/bin/runbld
19+
set -euo pipefail
20+
21+
export RBENV_VERSION='2.3.0'
22+
export PATH="$HOME/.rbenv/bin:$PATH"
23+
eval "$(rbenv init -)"
24+
rbenv local $RBENV_VERSION
25+
26+
echo '--color' >> ~/.rspec
27+
bundle install
28+
bundle exec rake intake

‎.ci/jobs/elastic+puppet-elasticsearch+master.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
- job:
3+
name: elastic+puppet-elasticsearch+master
4+
display-name: elastic / puppet-elasticsearch - master
5+
description: Master branch testing
6+
project-type: multijob
7+
scm:
8+
- git:
9+
wipe-workspace: 'False'
10+
triggers:
11+
- timed: H H(02-04) * * *
12+
builders:
13+
- multijob:
14+
name: intake phase
15+
projects:
16+
- name: elastic+puppet-elasticsearch+master+intake
17+
predefined-parameters: branch_specifier=master
18+
- multijob:
19+
name: acceptance phase
20+
projects:
21+
- name: elastic+puppet-elasticsearch+master+acceptance
22+
predefined-parameters: branch_specifier=master

‎.ci/jobs/elastic+puppet-elasticsearch+pull-request+acceptance.yml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
---
2+
- job:
3+
name: elastic+puppet-elasticsearch+pull-request+acceptance
4+
display-name: elastic / puppet-elasticsearch - pull-request - acceptance
5+
description: Pull request testing - acceptance
6+
scm:
7+
- git:
8+
refspec: +refs/pull/*:refs/remotes/origin/pr/*
9+
axes:
10+
- axis:
11+
type: slave
12+
name: label
13+
values:
14+
- linux
15+
- axis:
16+
name: OS
17+
filename: spec/matrix.yml
18+
type: yaml
19+
- axis:
20+
name: TEST_TYPE
21+
filename: spec/matrix.yml
22+
type: yaml
23+
builders:
24+
- shell: |-
25+
#!/usr/local/bin/runbld
26+
set -euo pipefail
27+
28+
export RBENV_VERSION='2.3.0'
29+
export PATH="$HOME/.rbenv/bin:$PATH"
30+
eval "$(rbenv init -)"
31+
rbenv local $RBENV_VERSION
32+
33+
# We need to not use [VERSION] in the matrix name since having
34+
# square brackets in the directories breaks some of the puppet tests
35+
case "$TEST_TYPE" in
36+
latest)
37+
test=acceptance
38+
;;
39+
snapshot)
40+
test=snapshot
41+
;;
42+
*)
43+
test="acceptance[$TEST_TYPE]"
44+
;;
45+
esac
46+
47+
echo '--color' >> ~/.rspec
48+
bundle install
49+
bundle exec rake "beaker:$OS:$test"

‎.ci/jobs/elastic+puppet-elasticsearch+pull-request+intake.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
---
2+
- job:
3+
name: elastic+puppet-elasticsearch+pull-request+intake
4+
display-name: elastic / puppet-elasticsearch - pull-request - intake
5+
description: Pull request testing - intake
6+
scm:
7+
- git:
8+
refspec: +refs/pull/*:refs/remotes/origin/pr/*
9+
axes:
10+
- axis:
11+
type: slave
12+
name: label
13+
values:
14+
- linux
15+
- axis:
16+
name: PUPPET_VERSION
17+
filename: spec/matrix.yml
18+
type: yaml
19+
builders:
20+
- shell: |-
21+
#!/usr/local/bin/runbld
22+
set -euo pipefail
23+
24+
export RBENV_VERSION='2.3.0'
25+
export PATH="$HOME/.rbenv/bin:$PATH"
26+
eval "$(rbenv init -)"
27+
rbenv local $RBENV_VERSION
28+
29+
echo '--color' >> ~/.rspec
30+
bundle install
31+
bundle exec rake intake

‎.ci/jobs/elastic+puppet-elasticsearch+pull-request.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
---
2+
- job:
3+
name: elastic+puppet-elasticsearch+pull-request
4+
display-name: elastic / puppet-elasticsearch - pull-request
5+
description: Pull request testing
6+
project-type: multijob
7+
scm:
8+
- git:
9+
branches:
10+
- $ghprbActualCommit
11+
refspec: +refs/pull/*:refs/remotes/origin/pr/*
12+
wipe-workspace: 'False'
13+
triggers:
14+
- github-pull-request:
15+
github-hooks: true
16+
org-list:
17+
- elastic
18+
allow-whitelist-orgs-as-admins: true
19+
cancel-builds-on-update: false
20+
status-context: devops-ci
21+
builders:
22+
- multijob:
23+
name: intake phase
24+
projects:
25+
- name: elastic+puppet-elasticsearch+pull-request+intake
26+
predefined-parameters: branch_specifier=${ghprbActualCommit}
27+
- multijob:
28+
name: acceptance phase
29+
projects:
30+
- name: elastic+puppet-elasticsearch+pull-request+acceptance
31+
predefined-parameters: branch_specifier=${ghprbActualCommit}

‎.fixtures.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ fixtures:
33
archive:
44
repo: puppet/archive
55
ref: 0.5.1
6+
augeas_core:
7+
repo: puppetlabs/augeas_core
8+
ref: 1.0.4
69
stdlib:
710
repo: puppetlabs/stdlib
811
ref: 4.13.1
@@ -19,8 +22,11 @@ fixtures:
1922
repo: puppetlabs/apt
2023
ref: 2.2.2
2124
zypprepo:
22-
repo: darin/zypprepo
23-
ref: 1.0.2
25+
repo: puppet/zypprepo
26+
ref: 2.2.2
27+
yumrepo_core:
28+
repo: puppetlabs/yumrepo_core
29+
ref: 1.0.3
2430
java_ks: puppetlabs/java_ks
2531
elastic_stack:
2632
repo: elastic/elastic_stack

‎.travis.yml‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,28 @@ jobs:
1414
- env:
1515
- TASK=beaker:ubuntu-server-1404-x64:snapshot
1616
- env:
17+
- OSS_PACKAGE=true
18+
- TASK=beaker:ubuntu-server-1404-x64:snapshot
19+
- env:
20+
- TASK=beaker:ubuntu-server-1604-x64:snapshot
21+
- env:
22+
- OSS_PACKAGE=true
1723
- TASK=beaker:ubuntu-server-1604-x64:snapshot
1824
- env:
1925
- TASK=beaker:centos-6-x64:snapshot
2026
- env:
27+
- OSS_PACKAGE=true
28+
- TASK=beaker:centos-6-x64:snapshot
29+
- env:
30+
- TASK=beaker:centos-7-x64:snapshot
31+
- env:
32+
- OSS_PACKAGE=true
2133
- TASK=beaker:centos-7-x64:snapshot
2234
- env:
2335
- TASK=beaker:debian-8-x64:snapshot
36+
- env:
37+
- OSS_PACKAGE=true
38+
- TASK=beaker:debian-8-x64:snapshot
2439
- env:
2540
- TASK=beaker:debian-9-x64:snapshot
2641
- env:
@@ -36,6 +51,9 @@ jobs:
3651
- env:
3752
- TASK=intake
3853
- PUPPET_VERSION='~> 5.0'
54+
- env:
55+
- TASK=intake
56+
- PUPPET_VERSION='~> 6.0'
3957
- stage: acceptance
4058
env:
4159
- TASK=beaker:centos-6-x64:acceptance
@@ -67,12 +85,6 @@ jobs:
6785
- TASK=beaker:oracle-7-x64:acceptance[5.6.9]
6886
- env:
6987
- TASK=beaker:oracle-7-x64:acceptance[2.4.6]
70-
- env:
71-
- TASK=beaker:opensuse-42-x64:acceptance
72-
- env:
73-
- TASK=beaker:opensuse-42-x64:acceptance[5.6.9]
74-
- env:
75-
- TASK=beaker:opensuse-42-x64:acceptance[2.4.6]
7688
- env:
7789
- TASK=beaker:debian-8-x64:acceptance
7890
- env:

‎CHANGELOG.md‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
## x.x.x (Month Day, Year)
22

3-
### Migration Guide
3+
#### Features
4+
* Support for Puppet 6
5+
6+
#### Fixes
7+
8+
## 6.3.4 (August 7, 2019)
49

510
#### Puppet < 4.10 No Longer Supported
611

@@ -14,8 +19,6 @@ Puppet 4.10.0 is the new minimum required version of Puppet.
1419
* Correctly permit instances to be set to `absent` without errors.
1520
* Resolved an issue arising from the use of `hiera()` in Hiera yaml data files.
1621

17-
#### Features
18-
1922
## 6.3.3 (September 7, 2018)
2023

2124
Note that this release includes changes to a default value that may affect users that rely on `curl` or `wget` to retrieve Elasticsearch package files, as now all certificates are validated by default.

0 commit comments

Comments
 (0)