Merge pull request #6 from genaumann/202410-salt

202410

.github/workflows/lint.yml

@@ -15,7 +15,7 @@ jobs:
           python-version: "3.11"
       - name: Install salt-lint
         run: |
-          sudo pip3 install salt-lint
+          sudo pip3 install salt-lint --break-system-packages
       - name: Run salt-lint
         run: |
           salt-lint $(find . -name '*.sls')

.github/workflows/salt-kitchen.yml

@@ -12,11 +12,17 @@ jobs:
     strategy:
       matrix:
         instances:
-          - default-ubuntu-2204-30065
-          - default-debian-12-30065
-          - default-rocky9-30065
-          - default-fedora38-30065
-          - default-opensuse15-30060
+          - default-ubuntu-2204-30069
+          - default-ubuntu-2404-30069
+          - default-ubuntu-2204-30071
+          - default-ubuntu-2404-30071
+          - default-debian-12-30069
+          - default-debian-12-30071
+          - default-rocky9-30069
+          - default-rocky9-30071
+          - default-fedora40-30069
+          - default-fedora40-30071
+          #- default-opensuse15-30060 / symlink of docker formula not resolved ... can't test
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
@@ -25,6 +31,11 @@ jobs:
         with:
           ruby-version: "3.2.2"
           bundler-cache: true
+      - name: Add hashicorp source
+        run: |
+          wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg
+          echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
+          sudo apt-get update
       - name: Install vagrant and virtualbox
         uses: ConorMacBride/install-package@v1
         with:

Gemfile

@@ -6,3 +6,4 @@ gem 'kitchen-inspec'
 gem 'kitchen-salt', '>= 0.6.3'
 gem 'kitchen-vagrant'
 gem 'test-kitchen'
+gem 'thor', '< 1.3.0'