Merge branch 'mattmi/fix-cookbook-publish-on-ruby-3' into 'main'

Remove the cookbook-publisher lockfile if not running ruby 2.X

See merge request gitlab-com/gl-infra/common-ci-tasks!850

templates/chef.yml

@@ -116,6 +116,7 @@ push-cookbook:
   only:
     refs:
       - master
+      - main
     variables:
       - "$OPS_CLONE_USERNAME"
       - "$OPS_CLONE_PASSWORD"
@@ -123,5 +124,6 @@ push-cookbook:
     - rm -rf Gemfile Gemfile.lock || true
     - git clone https://$OPS_CLONE_USERNAME:$OPS_CLONE_PASSWORD@ops.gitlab.net/gitlab-cookbooks/cookbook-publisher.git /tmp/cookbook-publisher
     - cp /tmp/cookbook-publisher/publisher.rb /tmp/cookbook-publisher/Gemfile /tmp/cookbook-publisher/Gemfile.lock .
+    - if [[ "$(ruby -v | awk '{print $2}')" =~ ^2 ]]; then echo "Using cookbook-publisher lockfile" ; else rm Gemfile.lock ; fi
     - bundle install
     - bundle exec ruby publisher.rb