Merge remote-tracking branch 'upstream/main' into rhoai-2.23

Author: riprasad

.github/workflows/code-quality.yaml

@@ -69,8 +69,8 @@ jobs:
         id: validate-yaml-files
         run: |
           type yamllint || sudo apt-get -y install yamllint
-          # We ignore the .tekton directory with the konflux pipelines definitions as it's managed by devops (and usually violates rules...).
-          find . -name "*.yaml" | grep -v "./.tekton/" | xargs yamllint --strict --config-file ./ci/yamllint-config.yaml
+          # We ignore the insta-merge.yaml and .tekton directory with the konflux pipelines definitions as it's managed by devops (and usually violates rules...).
+          find . -name "*.yaml" | grep -v "./.tekton/" | grep -v "./.github/workflows/insta-merge.yaml" | xargs yamllint --strict --config-file ./ci/yamllint-config.yaml
           find . -name "*.yml" | grep -v "./.tekton/" | xargs yamllint --strict --config-file ./ci/yamllint-config.yaml
 
       # In some YAML files we use JSON strings, let's check these

.github/workflows/piplock-renewal.yaml

@@ -65,9 +65,12 @@ jobs:
         run: pip install pipenv
 
       # Run makefile recipe to refresh Pipfile.lock and push changes back to the branch
-      - name: Run make refresh-pipfilelock-files and push the changes back to the branch
+      - name: Run `make refresh-pipfilelock-files`
         run: |
           make refresh-pipfilelock-files PYTHON_VERSION=${{ env.PYTHON_VERSION }} INCLUDE_OPT_DIRS=${{ env.INCLUDE_OPT_DIRS }}
+
+      - name: Push the changes back to the branch
+        run: |
           git add .
           git commit -m "Update Pipfile.lock files by piplock-renewal.yaml action"
           git push origin ${{ env.BRANCH }}