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

Author: moulalis

.github/workflows/code-quality.yaml

@@ -69,8 +69,9 @@ jobs:
         id: validate-yaml-files
         run: |
           type yamllint || sudo apt-get -y install yamllint
-          find . -name "*.yaml" | xargs yamllint --strict --config-file ./ci/yamllint-config.yaml
-          find . -name "*.yml" | xargs yamllint --strict --config-file ./ci/yamllint-config.yaml
+          # 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
+          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
       - name: Validate JSON strings in YAML files (just syntax)

.github/workflows/instant-merge.yaml

@@ -0,0 +1,26 @@
+name: Instant Merge Konflux PRs
+
+on:
+  pull_request:
+    types:
+      - opened
+    paths:
+      - manifests/base/params-latest.env
+
+permissions:
+  contents: write
+  pull-requests: write
+  checks: write
+  security-events: write
+  statuses: write
+
+jobs:
+  instant-merge:
+    runs-on: ubuntu-latest
+    steps:
+      - name: instant-merge
+        if: ${{ github.event.sender.login == 'red-hat-konflux[bot]' && ( contains(github.event.pull_request.title, 'Update odh-workbench-jupyter-') || contains(github.event.pull_request.title, 'Update odh-workbench-codeserver-') || contains(github.event.pull_request.title, 'Update odh-pipeline-runtime-') ) }}
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        run: |
+          gh pr merge --merge --admin ${{ github.event.pull_request.html_url }}