From 2989f38b0b0f410e9f20116f033e0636266b352d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
Date: Sat, 16 May 2026 15:59:40 +0200
Subject: [PATCH 1/3] Change the PR-Agent configuration to use Claude 4.6

(cherry picked from commit 99194aec84d622b2e3318fd53f4bcff4affa3213)
---
 .gitlab-ci.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a07d13313c..8d94271a09 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2809,8 +2809,15 @@ pr-agent:
     - echo "MR_URL=$MR_URL"
     - export gitlab__url="$CI_SERVER_URL"
     - export gitlab__PERSONAL_ACCESS_TOKEN="$GITLAB_PERSONAL_ACCESS_TOKEN"
+    - export config__model="anthropic/claude-opus-4-6"
+    - export config__fallback_models="[\"anthropic/claude-sonnet-4-6\"]"
+    - export config__enable_claude_extended_thinking=true
+    - export config__add_repo_metadata=true
+    - export config__add_repo_metadata_file_list="[\"CONTRIBUTING.md\"]"
     - export config__git_provider="gitlab"
     - export openai__key="$OPENAI_KEY"
+    - export anthropic__KEY="$ANTHROPIC_API_KEY"
+    - export config__reasoning_effort="high"
     - python -m pr_agent.cli --pr_url="$MR_URL" review
     - python -m pr_agent.cli --pr_url="$MR_URL" improve
   rules:

From 43840637b6b75de47b425371841e4b058497ffe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
Date: Sat, 16 May 2026 17:53:20 +0200
Subject: [PATCH 2/3] Allow failure to not block pipelines for the PR-Agent CI
 job

(cherry picked from commit dae0820f804f9dc1d6f35dd193b8659d8286deba)
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8d94271a09..49a9c8018a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2823,4 +2823,4 @@ pr-agent:
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_SOURCE_PROJECT_PATH == $CI_PROJECT_PATH && $GITLAB_PERSONAL_ACCESS_TOKEN && $OPENAI_KEY'
       when: manual
-    - when: never
+      allow_failure: true

From e26b3df358cb6c97b394887b021eba5ad11e6c12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
Date: Sat, 16 May 2026 18:02:49 +0200
Subject: [PATCH 3/3] Add both Claude 4.6 and ChatGPT in two separate job
 pipelines

(cherry picked from commit ee5e933933aeab6ccb41b315f1f6e8e22a8b8cb9)
---
 .gitlab-ci.yml | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 49a9c8018a..54b5c403e6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2798,7 +2798,7 @@ autorebase-sub:
   rules:
     - if: '$CI_PROJECT_NAMESPACE == "isc-private" && $CI_PIPELINE_SOURCE == "pipeline" && $CI_COMMIT_REF_NAME =~ /^bind-9\.[0-9]+-sub$/ && $REBASE_ONLY == "1" && $CI_COMMIT_REF_NAME =~ $AUTOREBASED_BRANCHES'
 
-pr-agent:
+pr-agent-claude:
   <<: *other_checks_job
   image:
     name: registry.gitlab.isc.org/isc-projects/images/pr-agent:latest
@@ -2815,11 +2815,33 @@ pr-agent:
     - export config__add_repo_metadata=true
     - export config__add_repo_metadata_file_list="[\"CONTRIBUTING.md\"]"
     - export config__git_provider="gitlab"
-    - export openai__key="$OPENAI_KEY"
     - export anthropic__KEY="$ANTHROPIC_API_KEY"
     - export config__reasoning_effort="high"
     - python -m pr_agent.cli --pr_url="$MR_URL" review
     - python -m pr_agent.cli --pr_url="$MR_URL" improve
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_SOURCE_PROJECT_PATH == $CI_PROJECT_PATH && $GITLAB_PERSONAL_ACCESS_TOKEN && $ANTHROPIC_API_KEY'
+      when: manual
+      allow_failure: true
+
+pr-agent-chatgpt:
+  <<: *other_checks_job
+  image:
+    name: registry.gitlab.isc.org/isc-projects/images/pr-agent:latest
+    entrypoint: [""]
+  script:
+    - cd /app
+    - export MR_URL="$CI_MERGE_REQUEST_PROJECT_URL/-/merge_requests/$CI_MERGE_REQUEST_IID"
+    - echo "MR_URL=$MR_URL"
+    - export gitlab__url="$CI_SERVER_URL"
+    - export gitlab__PERSONAL_ACCESS_TOKEN="$GITLAB_PERSONAL_ACCESS_TOKEN"
+    - export config__add_repo_metadata=true
+    - export config__add_repo_metadata_file_list="[\"CONTRIBUTING.md\"]"
+    - export config__git_provider="gitlab"
+    - export openai__key="$OPENAI_KEY"
+    - export config__reasoning_effort="high"
+    - python -m pr_agent.cli --pr_url="$MR_URL" review
+    - python -m pr_agent.cli --pr_url="$MR_URL" improve
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_SOURCE_PROJECT_PATH == $CI_PROJECT_PATH && $GITLAB_PERSONAL_ACCESS_TOKEN && $OPENAI_KEY'
       when: manual