From e6d15de3445d5a117bd426dcd4073729981bb26c Mon Sep 17 00:00:00 2001 From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com> Date: Wed, 13 Mar 2024 13:43:58 -0400 Subject: [PATCH 01/11] Remove unused variables in the prerelease.yml workflow These were missed in cisagov/skeleton-packer#98 (in https://github.com/cisagov/skeleton-packer/commit/b2e5cf88f0fc1606d251daba525b018e53756a70 specifically). --- .github/workflows/prerelease.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index f322580..1f8dcfa 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -107,10 +107,6 @@ jobs: - name: Install Packer plugins run: packer init src - name: Create machine image - env: - GITHUB_IS_PRERELEASE: ${{ github.event.release.prerelease }} - GITHUB_RELEASE_TAG: ${{ github.event.release.tag_name }} - GITHUB_RELEASE_URL: ${{ github.event.release.html_url }} run: | packer build -timestamp-ui \ -var is_prerelease=${{ github.event.release.prerelease }} \ From 0b1f9d19a6aa02f2651d6255488c1a0ac0daa6a1 Mon Sep 17 00:00:00 2001 From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com> Date: Wed, 3 Apr 2024 03:29:57 -0400 Subject: [PATCH 02/11] Fix the formatting for commented out ignore directives The commented out ignore directives for the pip package ecosystem are formatted in such a way that doing a multiline uncomment with an IDE will not produce valid YAML. --- .github/dependabot.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 3909457..e316b0d 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -28,8 +28,8 @@ updates: - directory: / # ignore: # # Managed by cisagov/skeleton-packer - # - dependency-name: ansible - # - dependency-name: ansible-core + # - dependency-name: ansible + # - dependency-name: ansible-core package-ecosystem: pip schedule: interval: weekly From f0226268146b00fd2b9ca7f03891df3796c3ec59 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Tue, 30 Apr 2024 15:54:43 -0400 Subject: [PATCH 03/11] Add code to install and configure systemd-resolved --- src/base.yml | 3 +++ src/requirements.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/base.yml b/src/base.yml index fed4116..9174b7f 100644 --- a/src/base.yml +++ b/src/base.yml @@ -19,3 +19,6 @@ - name: Configure JournalD to preserve logs across reboots ansible.builtin.include_role: name: persist_journald + - name: Install and configure systemd-resolved + ansible.builtin.include_role: + name: systemd_resolved diff --git a/src/requirements.yml b/src/requirements.yml index dc9ad7a..b9e897a 100644 --- a/src/requirements.yml +++ b/src/requirements.yml @@ -27,5 +27,8 @@ src: https://github.com/cisagov/ansible-role-python - name: remove_python2 src: https://github.com/cisagov/ansible-role-remove-python2 +- name: systemd_resolved + src: https://github.com/cisagov/ansible-role-systemd-resolved + version: first-commits - name: upgrade src: https://github.com/cisagov/ansible-role-upgrade From 7c425d3835160d4472734b73ffccb430c5d2af74 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Tue, 30 Apr 2024 15:55:34 -0400 Subject: [PATCH 04/11] Bump version from 1.0.0 to 1.0.1 --- src/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.txt b/src/version.txt index 5becc17..5c4105c 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "1.0.0" +__version__ = "1.0.1" From a67952f815df8cc26716a53b4c22d2c9ae9f2c75 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Tue, 30 Apr 2024 15:55:47 -0400 Subject: [PATCH 05/11] Bump version from 1.0.1 to 1.0.1-rc.1 --- src/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.txt b/src/version.txt index 5c4105c..b473b97 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "1.0.1" +__version__ = "1.0.1-rc.1" From c950f859a23bcb559d588ae8b305c4c842fc3fe6 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Sat, 4 May 2024 23:01:35 -0400 Subject: [PATCH 06/11] Add reminder that pin must be in sync with two other places cisagov/skeleton-generic, cisagov/skeleton-ansible-role, and cisagov/skeleton-packer all must pin ansible-core and stay in sync. --- requirements.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 272a7a3..ec3e967 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,7 +20,11 @@ ansible>=8,<10 # ansible/ansible#82702, which breaks any symlinked files in vars, # tasks, etc. for any Ansible role installed via ansible-galaxy. # -# See also cisagov/skeleton-ansible-role#178. +# See also cisagov/skeleton-ansible-role#178 and +# cisagov/skeleton-generic#180. Note from these PRs that any changes +# made to this dependency must also be made in requirements-test.txt +# in cisagov/skeleton-ansible-role and .pre-commit-config.yaml in +# cisagov/skeleton-generic. ansible-core<2.16.3 boto3 docopt From 3fec4e5d5f5fac76afdb753e93b4189248dc7664 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Wed, 8 May 2024 13:23:07 -0400 Subject: [PATCH 07/11] Revert to using the default branch of cisagov/ansible-role-systemd-resolved We can do this now that cisagov/ansible-role-systemd-resolved#1 has been approved and merged. --- src/requirements.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/requirements.yml b/src/requirements.yml index b9e897a..a9ab9db 100644 --- a/src/requirements.yml +++ b/src/requirements.yml @@ -29,6 +29,5 @@ src: https://github.com/cisagov/ansible-role-remove-python2 - name: systemd_resolved src: https://github.com/cisagov/ansible-role-systemd-resolved - version: first-commits - name: upgrade src: https://github.com/cisagov/ansible-role-upgrade From ed66a841e650422e85f1ad4b5641a43561dd500b Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Wed, 8 May 2024 13:24:23 -0400 Subject: [PATCH 08/11] Finalize version from 1.0.1-rc.1 to 1.0.1 --- src/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.txt b/src/version.txt index b473b97..5c4105c 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "1.0.1-rc.1" +__version__ = "1.0.1" From 55e81338afa218863bc726ea8e9b0a40c18ea5f1 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Tue, 14 May 2024 12:11:55 -0400 Subject: [PATCH 09/11] Bump version from 0.4.0 to 0.4.1 --- src/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.txt b/src/version.txt index 6a9beea..3d26edf 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "0.4.0" +__version__ = "0.4.1" From b6a2508a60027555eb8bd5b1f0151e574163e46f Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Tue, 14 May 2024 12:12:04 -0400 Subject: [PATCH 10/11] Bump version from 0.4.1 to 0.4.1-rc.1 --- src/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.txt b/src/version.txt index 3d26edf..dab9bad 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "0.4.1" +__version__ = "0.4.1-rc.1" From 3180afb775a497aae791dacf4a652fa348898796 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Fri, 17 May 2024 17:03:34 -0400 Subject: [PATCH 11/11] Finalize version from 0.4.1-rc.1 to 0.4.1 --- src/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.txt b/src/version.txt index dab9bad..3d26edf 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "0.4.1-rc.1" +__version__ = "0.4.1"