From de3a3cddd9382975d345587da51b3ba42b4671b3 Mon Sep 17 00:00:00 2001 From: Michael Hashizume Date: Thu, 1 Feb 2024 16:38:48 -0800 Subject: Replace assert_no_match The assert_no_match method in Beaker was long deprecated then eventually removed altogether in voxpupuli/beaker@6282311 This commit updates assert_no_match to refute_match. --- spec/acceptance/tests/destroy_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/acceptance/tests/destroy_spec.rb b/spec/acceptance/tests/destroy_spec.rb index a5cb122..380fc96 100644 --- a/spec/acceptance/tests/destroy_spec.rb +++ b/spec/acceptance/tests/destroy_spec.rb @@ -34,7 +34,7 @@ RSpec.context 'Mailalias: should delete an email alias' do # verify the alias is absent on(agent, 'cat /etc/aliases') do |res| - assert_no_match(%r{#{name}:.*foo,bar,baz}, res.stdout, 'mailalias was not removed from aliases file') + refute_match(%r{#{name}:.*foo,bar,baz}, res.stdout, 'mailalias was not removed from aliases file') end end end -- cgit v1.2.3 From 9af68790535331cb40816b0af34bdfa3005d0ece Mon Sep 17 00:00:00 2001 From: Michael Hashizume Date: Thu, 1 Feb 2024 16:40:00 -0800 Subject: Update stdout call Previously in Beaker, you could use a standalone stdout method to access output from remote machines. This was deprecated in 2013 with voxpupuli/beaker@28b2510 and dropped entirely in voxpupuli/beaker@73a31c7. This commit replaces stdout in favor of calling stdout on Result objects. --- spec/acceptance/tests/query_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/acceptance/tests/query_spec.rb b/spec/acceptance/tests/query_spec.rb index 17e0bbf..43bbcaf 100644 --- a/spec/acceptance/tests/query_spec.rb +++ b/spec/acceptance/tests/query_spec.rb @@ -27,8 +27,8 @@ RSpec.context 'should be able to find an exisitng email alias' do non_windows_agents.each do |agent| it 'queries for the mail alias with puppet' do - on(agent, puppet_resource('mailalias', name)) do - fail_test "didn't find the scheduled_task #{name}" unless stdout.include? 'present' + on(agent, puppet_resource('mailalias', name)) do |res| + fail_test "didn't find the scheduled_task #{name}" unless res.stdout.include? 'present' end end end -- cgit v1.2.3 From 0158a2d88cfb551c47e4b9e72c1795a3f68c4008 Mon Sep 17 00:00:00 2001 From: Michael Hashizume Date: Thu, 1 Feb 2024 16:42:41 -0800 Subject: Add Jira workflow This commit adds a GitHub Actions workflow to export issues from GitHub into Jira. --- .github/workflows/jira.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/jira.yml diff --git a/.github/workflows/jira.yml b/.github/workflows/jira.yml new file mode 100644 index 0000000..47f8080 --- /dev/null +++ b/.github/workflows/jira.yml @@ -0,0 +1,20 @@ +--- +name: Export issue to Jira + +on: + issues: + types: [labeled] + +permissions: + issues: write + +jobs: + export: + uses: "puppetlabs/phoenix-github-actions/.github/workflows/jira.yml@main" + with: + jira-project: PA + jira-base-url: ${{ vars.jira_base_url }} + jira-user-email: ${{ vars.jira_user_email }} + secrets: + jira-api-token: ${{ secrets.JIRA_ISSUES_ACTION }} + -- cgit v1.2.3 From bf45fba3850ff5b9c68cc54cf2d43857fd93b16c Mon Sep 17 00:00:00 2001 From: Michael Hashizume Date: Thu, 1 Feb 2024 16:43:37 -0800 Subject: Update issues URL in metadata.json --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index b626f62..bd99ed2 100644 --- a/metadata.json +++ b/metadata.json @@ -6,7 +6,7 @@ "license": "Apache-2.0", "source": "https://github.com/puppetlabs/puppetlabs-mailalias_core", "project_page": "https://github.com/puppetlabs/puppetlabs-mailalias_core", - "issues_url": "https://tickets.puppetlabs.com/projects/MODULES", + "issues_url": "https://github.com/puppetlabs/puppetlabs-mailalias_core/issues", "dependencies": [ ], -- cgit v1.2.3 From ceb521d16751f4f4b1ee577827f14ccc9380ed45 Mon Sep 17 00:00:00 2001 From: Michael Hashizume Date: Thu, 1 Feb 2024 16:44:58 -0800 Subject: Use reusable static code analysis This commit updates the static code analysis GitHub Actions workflow from using a copy in this repository to a resuable copy in the Phoenix team centralized GitHub Actions repository. In addition, this removes the commits Rake task as it is no longer used in the reusable version of this workflow. --- .github/workflows/static_code_analysis.yaml | 40 ++--------------------------- rakelib/commits.rake | 26 ------------------- 2 files changed, 2 insertions(+), 64 deletions(-) delete mode 100644 rakelib/commits.rake diff --git a/.github/workflows/static_code_analysis.yaml b/.github/workflows/static_code_analysis.yaml index b639220..62438da 100644 --- a/.github/workflows/static_code_analysis.yaml +++ b/.github/workflows/static_code_analysis.yaml @@ -6,44 +6,8 @@ on: branches: [ main ] pull_request: branches: [ main ] + workflow_dispatch: jobs: static_code_analysis: - name: Run checks - - env: - ruby_version: 2.6 - extra_checks: check:symlinks check:git_ignore check:dot_underscore check:test_file - - runs-on: 'ubuntu-20.04' - steps: - - name: Checkout current PR code - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Install ruby version ${{ env.ruby_version }} - uses: ruby/setup-ruby@v1 - with: - ruby-version: ${{ env.ruby_version }} - - - name: Prepare testing environment with bundler - run: | - git config --global core.longpaths true - bundle config set --local without 'release' - bundle update --jobs 4 --retry 3 - - - name: Run commits check - run: bundle exec rake commits - - - name: Run rubocop check - run: bundle exec rake ${{ env.extra_checks }} rubocop - - - name: Run syntax check - run: bundle exec rake ${{ env.extra_checks }} syntax syntax:hiera syntax:manifests syntax:templates - - - name: Run lint check - run: bundle exec rake ${{ env.extra_checks }} lint - - - name: Run metadata_lint check - run: bundle exec rake ${{ env.extra_checks }} metadata_lint + uses: "puppetlabs/phoenix-github-actions/.github/workflows/static_code_analysis.yaml@main" diff --git a/rakelib/commits.rake b/rakelib/commits.rake deleted file mode 100644 index 42eb209..0000000 --- a/rakelib/commits.rake +++ /dev/null @@ -1,26 +0,0 @@ -desc "verify that commit messages match CONTRIBUTING.md requirements" -task(:commits) do - # This rake task looks at the summary from every commit from this branch not - # in the branch targeted for a PR. - commit_range = 'HEAD^..HEAD' - puts "Checking commits #{commit_range}" - %x{git log --no-merges --pretty=%s #{commit_range}}.each_line do |commit_summary| - # This regex tests for the currently supported commit summary tokens. - # The exception tries to explain it in more full. - if /^Release prep|\((maint|packaging|doc|docs|modules-\d+)\)|revert/i.match(commit_summary).nil? - raise "\n\n\n\tThis commit summary didn't match CONTRIBUTING.md guidelines:\n" \ - "\n\t\t#{commit_summary}\n" \ - "\tThe commit summary (i.e. the first line of the commit message) should start with one of:\n" \ - "\t\t(MODULES-) # this is most common and should be a ticket at tickets.puppet.com\n" \ - "\t\t(docs)\n" \ - "\t\t(docs)(DOCUMENT-)\n" \ - "\t\t(packaging)\n" - "\t\t(maint)\n" \ - "\t\tRelease prep v\n" \ - "\n\tThis test for the commit summary is case-insensitive.\n\n\n" - else - puts "#{commit_summary}" - end - puts "...passed" - end -end -- cgit v1.2.3