Skip to content

Commit f75c488

Browse files
authored
Merge pull request #505 from puppetlabs/pdksync_releaseprepupdate
pdksync - PDK Update for auto release prep workflow
2 parents 4e79f82 + 03235ac commit f75c488

File tree

5 files changed

+16
-14
lines changed

5 files changed

+16
-14
lines changed

.github/workflows/auto_release.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,12 @@ jobs:
6666
branch: "release-prep"
6767
delete-branch: true
6868
title: "Release prep v${{ steps.gv.outputs.ver }}"
69-
body: "Automated release-prep through [pdk-templates](https://github.com/puppetlabs/pdk-templates/blob/main/moduleroot/.github/workflows/auto_release.yml.erb) from commit ${{ github.sha }}"
69+
body: |
70+
Automated release-prep through [pdk-templates](https://github.com/puppetlabs/pdk-templates/blob/main/moduleroot/.github/workflows/auto_release.yml.erb) from commit ${{ github.sha }}.
71+
Please verify before merging:
72+
- [ ] last [nightly](https://github.com/${{ github.repository }}/actions/workflows/nightly.yml) run is green
73+
- [ ] [Changelog](https://github.com/${{ github.repository }}/blob/release-prep/CHANGELOG.md) is readable and has no unlabeled pull requests
74+
- [ ] Ensure the [changelog](https://github.com/${{ github.repository }}/blob/release-prep/CHANGELOG.md) version and [metadata](https://github.com/${{ github.repository }}/blob/release-prep/metadata.json) version match
7075
labels: "maintenance"
7176

7277
- name: PR outputs

.github/workflows/integration_test.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,13 @@ jobs:
124124
echo ::group::=== INVENTORY ===
125125
sed -e 's/password: .*/password: "[redacted]"/' < inventory.yaml || true
126126
echo ::endgroup::
127+
- name: Disable gpg check google-cloud.repo
128+
uses: nick-invision/retry@v1
129+
with:
130+
timeout_minutes: 30
131+
max_attempts: 5
132+
retry_wait_seconds: 60
133+
command: buildevents cmd $TRACE_ID $STEP_ID 'rake kubernetes::disable_gpg' -- bundle exec bolt --modulepath spec/fixtures/modules command run "sed -i 's/gpgcheck=1/gpgcheck=0/g' /etc/yum.repos.d/google-cloud.repo" --targets '*' -i ./inventory.yaml
127134
- name: Puppet server setup
128135
run: |
129136
buildevents cmd $TRACE_ID $STEP_ID 'rake kubernetes::puppetserver_setup' -- bundle exec bolt --modulepath spec/fixtures/modules plan run kubernetes::puppetserver_setup -i ./inventory.yaml

Gemfile

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,6 @@ gems['puppet'] = location_for(puppet_version)
4545
gems['facter'] = location_for(facter_version) if facter_version
4646
gems['hiera'] = location_for(hiera_version) if hiera_version
4747

48-
if Gem.win_platform? && puppet_version =~ %r{^(file:///|git://)}
49-
# If we're using a Puppet gem on Windows which handles its own win32-xxx gem
50-
# dependencies (>= 3.5.0), set the maximum versions (see PUP-6445).
51-
gems['win32-dir'] = ['<= 0.4.9', require: false]
52-
gems['win32-eventlog'] = ['<= 0.6.5', require: false]
53-
gems['win32-process'] = ['<= 0.7.5', require: false]
54-
gems['win32-security'] = ['<= 0.2.5', require: false]
55-
gems['win32-service'] = ['0.8.8', require: false]
56-
end
57-
5848
gems.each do |gem_name, gem_params|
5949
gem gem_name, *gem_params
6050
end

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,5 @@
5555
],
5656
"pdk-version": "1.18.1",
5757
"template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
58-
"template-ref": "heads/main-0-g7be43a3"
58+
"template-ref": "heads/main-0-g12a5dea"
5959
}

spec/spec_helper_acceptance_local.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,8 @@ def execute_agent(role)
226226
name=Kubernetes
227227
baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
228228
enabled=1
229-
gpgcheck=1
230-
repo_gpgcheck=1
229+
gpgcheck=0
230+
repo_gpgcheck=0
231231
gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
232232
EOS
233233
pp = <<-PUPPETCODE

0 commit comments

Comments
 (0)