From 1fe76f4f3f50a95e4b5e42005c58fe3ab4307968 Mon Sep 17 00:00:00 2001
From: ConfluentSemaphore
 <40306929+ConfluentSemaphore@users.noreply.github.com>
Date: Wed, 11 Dec 2024 03:01:31 +0000
Subject: [PATCH 1/3] removing generated internal project.yml

---
 .semaphore/project.yml | 87 ------------------------------------------
 1 file changed, 87 deletions(-)
 delete mode 100644 .semaphore/project.yml

diff --git a/.semaphore/project.yml b/.semaphore/project.yml
deleted file mode 100644
index cd1a0a114..000000000
--- a/.semaphore/project.yml
+++ /dev/null
@@ -1,87 +0,0 @@
-# This file is managed by ServiceBot plugin - Semaphore. The content in this file is created using a common
-# template and configurations in service.yml.
-# Modifications in this file will be overwritten by generated content in the nightly run.
-# For more information, please refer to the page:
-# https://confluentinc.atlassian.net/wiki/spaces/Foundations/pages/2871296194/Add+SemaphoreCI
-apiVersion: v1alpha
-kind: Project
-metadata:
-  name: kafkacat-images
-  description: ""
-spec:
-  visibility: private
-  repository:
-    url: git@github.com:confluentinc/kafkacat-images.git
-    run_on:
-    - branches
-    - pull_requests
-    pipeline_file: .semaphore/semaphore.yml
-    integration_type: github_app
-    status:
-      pipeline_files:
-      - path: .semaphore/semaphore.yml
-        level: pipeline
-    whitelist:
-      branches:
-      - master
-      - main
-      - /^\d+\.\d+\.x$/
-      - /^\d+\.\d+\.\d+-cp\d+-rc\d+$/
-      - /^\d+\.\d+\.\d+-rc\d+$/
-      - /^gh-readonly-queue.*/
-  custom_permissions: true
-  debug_permissions:
-  - empty
-  - default_branch
-  - non_default_branch
-  - pull_request
-  - forked_pull_request
-  - tag
-  attach_permissions:
-  - default_branch
-  - non_default_branch
-  - pull_request
-  - forked_pull_request
-  - tag
-  tasks:
-  - name: cp-dockerfile-build
-    scheduled: False
-    branch: "master"
-    pipeline_file: .semaphore/cp_dockerfile_build.yml
-    parameters:
-    - name: CONFLUENT_VERSION
-      required: True
-    - name: PACKAGES_URL
-      required: True
-    - name: PACKAGES_MAVEN_URL
-      required: True
-    - name: PACKAGING_BUILD_NUMBER
-      required: True
-    - name: ALLOW_UNSIGNED
-      required: True
-      default_value: "False"
-      options:
-       - True
-       - False
-    - name: CONFLUENT_DEB_VERSION
-      required: True
-      default_value: "1"
-  - name: cp-dockerfile-promote
-    scheduled: False
-    branch: "master"
-    pipeline_file: .semaphore/cp_dockerfile_promote.yml
-    parameters:
-    - name: CONFLUENT_VERSION
-      required: True
-    - name: IMAGE_REVISION
-      required: True
-      default_value: "1"
-    - name: UPDATE_LATEST_TAG
-      required: True
-    - name: PACKAGING_BUILD_NUMBER
-      required: True
-    - name: PROMOTE_OS_TYPE
-      required: True
-      options:
-       - deb
-       - ubi

From ab2c25a1aac93f6fd439ea67c3df14acdc1c6708 Mon Sep 17 00:00:00 2001
From: ConfluentSemaphore
 <40306929+ConfluentSemaphore@users.noreply.github.com>
Date: Wed, 11 Dec 2024 03:01:31 +0000
Subject: [PATCH 2/3] chore: update repo semaphore config

---
 .semaphore/semaphore.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
index 9b633a7c5..d48259fb9 100644
--- a/.semaphore/semaphore.yml
+++ b/.semaphore/semaphore.yml
@@ -24,7 +24,7 @@ global_job_config:
   prologue:
     commands:
       - checkout
-      - sem-version java 8
+      - if [[ $SEMAPHORE_GIT_BRANCH =~ ^7\..* ]]; then sem-version java 8; else sem-version java 17; fi
       - . vault-setup
       - . cache-maven restore
       - export GIT_COMMIT=$(git rev-parse --verify HEAD --short)

From e1a60a8a82cd76dc9ebd080cf144abbf5ee3a091 Mon Sep 17 00:00:00 2001
From: ConfluentSemaphore
 <40306929+ConfluentSemaphore@users.noreply.github.com>
Date: Wed, 11 Dec 2024 03:01:31 +0000
Subject: [PATCH 3/3] chore: update repo semaphore task

---
 .semaphore/cp_dockerfile_build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.semaphore/cp_dockerfile_build.yml b/.semaphore/cp_dockerfile_build.yml
index 416faf047..9130e8f5d 100644
--- a/.semaphore/cp_dockerfile_build.yml
+++ b/.semaphore/cp_dockerfile_build.yml
@@ -24,7 +24,7 @@ global_job_config:
   prologue:
     commands:
       - checkout
-      - sem-version java 8
+      - if [[ $SEMAPHORE_GIT_BRANCH =~ ^7\..* ]]; then sem-version java 8; else sem-version java 17; fi
       - . vault-setup
       - . cache-maven restore
       - export GIT_COMMIT=$(git rev-parse --verify HEAD --short)