diff --git a/base b/base index 96352d5..df4c4c0 160000 --- a/base +++ b/base @@ -1 +1 @@ -Subproject commit 96352d587fac62d4668161f103a62ad164171ee3 +Subproject commit df4c4c06849c31c81db490a6c286b8bdcfd4ab1e diff --git a/template/.github/workflows/libbuild.yml b/template/.github/workflows/libbuild.yml index bb5dd78..880de08 100644 --- a/template/.github/workflows/libbuild.yml +++ b/template/.github/workflows/libbuild.yml @@ -28,6 +28,7 @@ jobs: runs-on: ${{ inputs.build-runner }} timeout-minutes: ${{ inputs.timeout-minutes }} env: + CHEF_LICENSE: accept-silent MAKE_VARS: "" steps: - name: Checkout repository @@ -68,21 +69,24 @@ jobs: run: vagrant plugin install vagrant-qemu - name: Install Test Kitchen if: ${{ !startsWith(runner.name, 'self') }} + uses: actionshub/chef-install@d41f8dde8642d5cd05abefa333fbf2784cff830c # 3.0.0 + env: + # renovate: datasource=github-tags depName=chef/chef-workstation + CHEF_WS_VERSION: 24.2.1058 + with: + project: chef-workstation + version: ${{ env.CHEF_WS_VERSION }} + - name: Prepare Test Kitchen + env: + # renovate: datasource=rubygems depName=kitchen-salt + KITCHEN-SALT_VERSION: 0.7.2 run: | - echo ::group::Installing Chef Workstation - kernel_name=$(uname -s) - if [ "$kernel_name" == "Linux" ]; then - wget --no-verbose https://packages.chef.io/files/stable/chef-workstation/23.7.1042/ubuntu/22.04/chef-workstation_23.7.1042-1_amd64.deb - sudo dpkg --install chef-workstation_23.7.1042-1_amd64.deb - elif [ "$kernel_name" == "Darwin" ]; then - sudo echo "Refresh sudo cached credential" - brew install chef-workstation + if [[ "${{ inputs.build-type }}" == vbox* ]]; then + echo TECHNEG_VAGRANT_PROVIDER=virtualbox >> $GITHUB_ENV + fi + if [[ "${{ runner.name }}" != self* ]]; then + chef gem install kitchen-salt --version ${{ env.KITCHEN-SALT_VERSION }} fi - echo ::endgroup:: - chef -v - - name: Prepare Test Kitchen - if: startsWith(inputs.build-type, 'vbox') - run: echo TECHNEG_VAGRANT_PROVIDER=virtualbox >> $GITHUB_ENV - name: Run Test Kitchen env: TECHNEG_VAGRANT_BOX: ${{ steps.packer.outputs.vagrant-box }} diff --git a/test/SetBoxName/libbuild_yml.tt b/test/SetBoxName/libbuild_yml.tt index bb5dd78..880de08 100644 --- a/test/SetBoxName/libbuild_yml.tt +++ b/test/SetBoxName/libbuild_yml.tt @@ -28,6 +28,7 @@ jobs: runs-on: ${{ inputs.build-runner }} timeout-minutes: ${{ inputs.timeout-minutes }} env: + CHEF_LICENSE: accept-silent MAKE_VARS: "" steps: - name: Checkout repository @@ -68,21 +69,24 @@ jobs: run: vagrant plugin install vagrant-qemu - name: Install Test Kitchen if: ${{ !startsWith(runner.name, 'self') }} + uses: actionshub/chef-install@d41f8dde8642d5cd05abefa333fbf2784cff830c # 3.0.0 + env: + # renovate: datasource=github-tags depName=chef/chef-workstation + CHEF_WS_VERSION: 24.2.1058 + with: + project: chef-workstation + version: ${{ env.CHEF_WS_VERSION }} + - name: Prepare Test Kitchen + env: + # renovate: datasource=rubygems depName=kitchen-salt + KITCHEN-SALT_VERSION: 0.7.2 run: | - echo ::group::Installing Chef Workstation - kernel_name=$(uname -s) - if [ "$kernel_name" == "Linux" ]; then - wget --no-verbose https://packages.chef.io/files/stable/chef-workstation/23.7.1042/ubuntu/22.04/chef-workstation_23.7.1042-1_amd64.deb - sudo dpkg --install chef-workstation_23.7.1042-1_amd64.deb - elif [ "$kernel_name" == "Darwin" ]; then - sudo echo "Refresh sudo cached credential" - brew install chef-workstation + if [[ "${{ inputs.build-type }}" == vbox* ]]; then + echo TECHNEG_VAGRANT_PROVIDER=virtualbox >> $GITHUB_ENV + fi + if [[ "${{ runner.name }}" != self* ]]; then + chef gem install kitchen-salt --version ${{ env.KITCHEN-SALT_VERSION }} fi - echo ::endgroup:: - chef -v - - name: Prepare Test Kitchen - if: startsWith(inputs.build-type, 'vbox') - run: echo TECHNEG_VAGRANT_PROVIDER=virtualbox >> $GITHUB_ENV - name: Run Test Kitchen env: TECHNEG_VAGRANT_BOX: ${{ steps.packer.outputs.vagrant-box }}