Reverted to using original Ruby 2.6.10 since 3.3.4 has exceptions cre…

…ating Amazon 2023 Test Instance
saltstack · Jul 11, 2024 · 0cc372f · 0cc372f
1 parent 06702a8
commit 0cc372f
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 76 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,15 +16,15 @@ jobs:
     outputs:
       run-tests: ${{ steps.set-output.outputs.run-tests }}
     steps:
-      ## DGM - uses: actions/checkout@v4
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      ## DGM - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Get specific changed files
         id: changed-files
-        ## DGM uses: tj-actions/changed-files@v42
-        uses: tj-actions/changed-files@v25
+        uses: tj-actions/changed-files@v42
+        ## DGM uses: tj-actions/changed-files@v25
         with:
           separator: ","
           files: |
@@ -49,8 +49,8 @@ jobs:
 
       - name: Upload Exit Status
         if: always()
-        ## DGM uses: actions/upload-artifact@v4
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
+        ## DGM uses: actions/upload-artifact@v3
         with:
           name: exitstatus
           path: exitstatus
@@ -62,13 +62,8 @@ jobs:
 
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
     steps:
-      ## DGM - uses: actions/checkout@v4
-      - uses: actions/checkout@v3
-
-      ## DGM - name: Set up Python 3.9
-      ## DGM   uses: actions/setup-python@v4
-      ## DGM   with:
-      ## DGM     python-version: 3.9
+      - uses: actions/checkout@v4
+      ## DGM - uses: actions/checkout@v3
 
       - name: Set up Python 3.10
         uses: actions/setup-python@v4
@@ -93,8 +88,8 @@ jobs:
 
       - name: Upload Exit Status
         if: always()
-        ## DGM uses: actions/upload-artifact@v4
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
+        ## DGM uses: actions/upload-artifact@v3
         with:
           name: exitstatus
           path: exitstatus
@@ -107,8 +102,8 @@ jobs:
     container: koalaman/shellcheck-alpine:latest
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
     steps:
-      ## DGM - uses: actions/checkout@v4
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      ## DGM - uses: actions/checkout@v3
       - name: ShellCheck
         run: |
           shellcheck -s sh -f tty bootstrap-salt.sh
@@ -121,8 +116,8 @@ jobs:
 
       - name: Upload Exit Status
         if: always()
-        ## DGM uses: actions/upload-artifact@v4
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
+        ## DGM uses: actions/upload-artifact@v3
         with:
           name: exitstatus
           path: exitstatus

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -46,7 +46,6 @@ jobs:
     name: Update S3 Bucket
     if: ${{ fromJSON(needs.workflow-requirements.outputs.requirements-met) }}
     runs-on:
-      ## DGM wonder about these
       - self-hosted
       - linux
       - repo-release

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -52,7 +52,6 @@ jobs:
   update-develop:
     name: Update CHANGELOG.md and bootstrap-salt.sh
     runs-on:
-      ## DGM wonder about these
       - self-hosted
       - linux
       - repo-release
@@ -296,7 +295,6 @@ jobs:
   update-s3-bucket:
     name: Update S3 Bucket
     runs-on:
-      ## DGM wonder about these
       - self-hosted
       - linux
       - repo-release
@@ -358,7 +356,6 @@ jobs:
   update-develop-checksums:
     name: Update Release Checksums on Develop
     runs-on:
-      ## DGM wonder about these
       - self-hosted
       - linux
       - repo-release

diff --git a/.github/workflows/templates/ci.yml b/.github/workflows/templates/ci.yml
@@ -16,15 +16,15 @@ jobs:
     outputs:
       run-tests: ${{ steps.set-output.outputs.run-tests }}
     steps:
-      ## DGM - uses: actions/checkout@v4
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      ## DGM - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Get specific changed files
         id: changed-files
-        ## DGM uses: tj-actions/changed-files@v42
-        uses: tj-actions/changed-files@v25
+        uses: tj-actions/changed-files@v42
+        ## DGM uses: tj-actions/changed-files@v25
         with:
           separator: ","
           files: |
@@ -49,8 +49,8 @@ jobs:
 
       - name: Upload Exit Status
         if: always()
-        ## DGM uses: actions/upload-artifact@v4
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
+        ## DGM uses: actions/upload-artifact@v3
         with:
           name: exitstatus
           path: exitstatus
@@ -62,13 +62,8 @@ jobs:
 
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
     steps:
-      ## DGM - uses: actions/checkout@v4
-      - uses: actions/checkout@v3
-
-      ## DGM - name: Set up Python 3.9
-      ## DGM   uses: actions/setup-python@v4
-      ## DGM   with:
-      ## DGM     python-version: 3.9
+      - uses: actions/checkout@v4
+      ## DGM - uses: actions/checkout@v3
 
       - name: Set up Python 3.10
         uses: actions/setup-python@v4
@@ -93,8 +88,8 @@ jobs:
 
       - name: Upload Exit Status
         if: always()
-        ## DGM uses: actions/upload-artifact@v4
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
+        ## DGM uses: actions/upload-artifact@v3
         with:
           name: exitstatus
           path: exitstatus
@@ -107,8 +102,8 @@ jobs:
     container: koalaman/shellcheck-alpine:latest
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
     steps:
-      ## DGM - uses: actions/checkout@v4
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      ## DGM - uses: actions/checkout@v3
       - name: ShellCheck
         run: |
           shellcheck -s sh -f tty bootstrap-salt.sh
@@ -121,8 +116,8 @@ jobs:
 
       - name: Upload Exit Status
         if: always()
-        ## DGM uses: actions/upload-artifact@v4
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
+        ## DGM uses: actions/upload-artifact@v3
         with:
           name: exitstatus
           path: exitstatus
diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
@@ -37,20 +37,13 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      ## DGM Need to replace this
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ## DGM ruby-version: 2.6.10
-          ruby-version: 3.2.3
-          ## DGM ruby-version: 3.3.4
+          ruby-version: 2.6.10
+          ## ruby-version: 3.3.4
           bundler-cache: true
 
-      ## DGM - name: Set up Python 3.9
-      ## DGM   uses: actions/setup-python@v4
-      ## DGM   with:
-      ## DGM     python-version: 3.9
-
       - name: Set up Python 3.10
         uses: actions/setup-python@v4
         with:
@@ -63,20 +56,17 @@ jobs:
 
       - name: Create Test Instance
         run: |
-          ## DGM Need to replace this
           (sleep 10 && bundle exec kitchen create ${{ matrix.instance }}-${{ inputs.distro-slug }})
           sleep 2
 
       - name: Test Bootstrap
         run: |
-          ## DGM Need to replace this
           bundle exec kitchen verify ${{ matrix.instance }}-${{ inputs.distro-slug }}
           sleep 2
 
       - name: Destroy Test Instance
         if: always()
         run: |
-          ## DGM Need to replace this
           bundle exec kitchen destroy ${{ matrix.instance }}-${{ inputs.distro-slug }}
           sleep 2
 

diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
@@ -31,8 +31,6 @@ on:
 env:
   KITCHEN_LOCAL_YAML: 'kitchen.macos.yml'
 
-## DGM Wonder what the KITCHEN_LOCAL_YAML had to be set here for MacOS, do we need to do something similar for runners ?
-
 jobs:
   Test:
     name: ${{ matrix.instance }}
@@ -46,20 +44,13 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      ## DGM Need to replace this
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ## DGM ruby-version: 2.6.10
-          ruby-version: 3.2.3
-          ## DGM ruby-version: 3.3.4
+          ruby-version: 2.6.10
+          ## ruby-version: 3.3.4
           bundler-cache: true
 
-      ## DGM - name: Set up Python 3.9
-      ## DGM   uses: actions/setup-python@v4
-      ## DGM   with:
-      ## DGM     python-version: 3.9
-
       - name: Set up Python 3.10
         uses: actions/setup-python@v4
         with:

diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
@@ -34,8 +34,6 @@ env:
   machine_port: 5985
   KITCHEN_LOCAL_YAML: 'kitchen.windows.yml'
 
-## DGM Wonder what the KITCHEN_LOCAL_YAML had to be set here for Windows, do we need to do something similar for runners ?
-
 jobs:
   Test:
     name: ${{ matrix.instance }}
@@ -49,13 +47,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      ## DGM Need to replace this
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ## DGM ruby-version: 2.6.10
-          ruby-version: 3.2.3
-          ## DGM ruby-version: 3.3.4
+          ruby-version: 2.6.10
+          ## ruby-version: 3.3.4
           bundler-cache: true
 
       - name: Install Chef
@@ -84,11 +80,6 @@ jobs:
           winrm set winrm/config/service '@{AllowUnencrypted="True"}'
           env
 
-      ## DGM - name: Set up Python 3.9
-      ## DGM   uses: actions/setup-python@v4
-      ## DGM   with:
-      ## DGM     python-version: 3.9
-
       - name: Set up Python 3.10
         uses: actions/setup-python@v4
         with: