From 3e6c506ebf0b06b7a075b744bf4816c6f9d1e3eb Mon Sep 17 00:00:00 2001
From: "Addisu Z. Taddese" <addisu@openrobotics.org>
Date: Tue, 29 Aug 2023 13:49:25 -0500
Subject: [PATCH] Use stable branches for gz-rendering and sdformat

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
---
 jenkins-scripts/dsl/gz-collections.yaml             |  4 ++--
 jenkins-scripts/dsl/ignition.dsl                    |  5 ++---
 jenkins-scripts/dsl/ignition_collection.dsl         | 12 ++++++------
 source-repo-scripts/merge_forward_pull_request.bash |  8 ++++++--
 source-repo-scripts/release_pull_request.bash       |  8 ++++++--
 5 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml
index c5276524b..cc8e38517 100644
--- a/jenkins-scripts/dsl/gz-collections.yaml
+++ b/jenkins-scripts/dsl/gz-collections.yaml
@@ -77,11 +77,11 @@ collections:
       - name: gz-rendering
         major_version: 8
         repo:
-          current_branch: main
+          current_branch: gz-rendering8
       - name: sdformat
         major_version: 14
         repo:
-          current_branch: main
+          current_branch: sdf14
       - name: gz-fuel-tools
         major_version: 9
         repo:
diff --git a/jenkins-scripts/dsl/ignition.dsl b/jenkins-scripts/dsl/ignition.dsl
index 0e33e6cc3..1e19a2537 100644
--- a/jenkins-scripts/dsl/ignition.dsl
+++ b/jenkins-scripts/dsl/ignition.dsl
@@ -67,10 +67,10 @@ gz_branches                 = [ 'cmake'      : [ '3' ],
                                 'gui'        : [ '7' ],
                                 'launch'     : [ '6' ],
                                 'math'       : [ '7' ],
-                                'msgs'       : [ '9', '10' ],
+                                'msgs'       : [ '9', '10'],
                                 'physics'    : [ '6' ],
                                 'plugin'     : [ '2' ],
-                                'rendering'  : [ '7' ],
+                                'rendering'  : [ '7' , '8'],
                                 'sensors'    : [ '7' ],
                                 'sim'        : [ '7' ],
                                 'tools'      : [ '2' ],
@@ -87,7 +87,6 @@ gz_extra_debbuild = [ 'gui8',
                       'fuel-tools9',
                       'launch7',
                       'physics7',
-                      'rendering8',
                       'sensors8',
                       'sim8',
                       'transport13',
diff --git a/jenkins-scripts/dsl/ignition_collection.dsl b/jenkins-scripts/dsl/ignition_collection.dsl
index eff285377..b82ee6c8c 100644
--- a/jenkins-scripts/dsl/ignition_collection.dsl
+++ b/jenkins-scripts/dsl/ignition_collection.dsl
@@ -285,7 +285,7 @@ gz_collection_jobs =
         'ign_msgs-gz-10-win',
         'ign_physics-gz-6-win',
         'ign_plugin-gz-2-win',
-        'ign_rendering-ci-win',
+        'ign_rendering-gz-8-win',
         'ign_sensors-ci-win',
         'ign_tools-gz-2-win',
         'ign_transport-gz-13-win',
@@ -299,7 +299,7 @@ gz_collection_jobs =
         'gz_msgs-ci-gz-msgs10-jammy-amd64',
         'gz_physics-ci-gz-physics6-jammy-amd64',
         'gz_plugin-ci-gz-plugin2-jammy-amd64',
-        'gz_rendering-ci-main-jammy-amd64',
+        'gz_rendering-ci-gz-rendering8-jammy-amd64',
         'gz_sensors-ci-main-jammy-amd64',
         'gz_sim-ci-main-jammy-amd64',
         'gz_tools-ci-gz-tools2-jammy-amd64',
@@ -316,14 +316,14 @@ gz_collection_jobs =
         'ignition_msgs-ci-gz-msgs10-homebrew-amd64',
         'ignition_physics-ci-gz-physics6-homebrew-amd64',
         'ignition_plugin-ci-gz-plugin2-homebrew-amd64',
-        'ignition_rendering-ci-main-homebrew-amd64',
+        'ignition_rendering-ci-gz-rendering8-homebrew-amd64',
         'ignition_sensors-ci-main-homebrew-amd64',
         'ignition_tools-ci-gz-tools2-homebrew-amd64',
         'ignition_transport-ci-gz-transport13-homebrew-amd64',
         'ignition_utils-ci-gz-utils2-homebrew-amd64',
-        'sdformat-ci-main-jammy-amd64',
-        'sdformat-ci-main-homebrew-amd64',
-        'sdformat-sdf-main-win'
+        'sdformat-ci-sdformat14-jammy-amd64',
+        'sdformat-ci-sdformat14-homebrew-amd64',
+        'sdformat-sdf-14-win'
   ],
 ]
 
diff --git a/source-repo-scripts/merge_forward_pull_request.bash b/source-repo-scripts/merge_forward_pull_request.bash
index 7b5ff7091..a6d3cc696 100755
--- a/source-repo-scripts/merge_forward_pull_request.bash
+++ b/source-repo-scripts/merge_forward_pull_request.bash
@@ -38,7 +38,10 @@ fi
 
 set -e
 
-CURRENT_BRANCH=$(git branch | sed -n -e 's/^\* \(.*\)/\1/p')
+LOCAL_BRANCH=$(git rev-parse --abbrev-ref  HEAD)
+REMOTE_BRANCH=$(git rev-parse --abbrev-ref  HEAD@{upstream})
+REMOTE=${REMOTE_BRANCH/\/$LOCAL_BRANCH/}
+CURRENT_BRANCH="${REMOTE}:${LOCAL_BRANCH}"
 
 ORIGIN_URL=$(git remote get-url origin)
 ORIGIN_ORG_REPO=$(echo ${ORIGIN_URL} | sed -e 's@.*github\.com.@@' | sed -e 's/\.git//g')
@@ -58,4 +61,5 @@ gh pr create \
     --repo "$ORIGIN_ORG_REPO" \
     --base "$TO_BRANCH" \
     --body "$BODY" \
-    --head "$CURRENT_BRANCH"
+    --head "$CURRENT_BRANCH" \
+    --web
diff --git a/source-repo-scripts/release_pull_request.bash b/source-repo-scripts/release_pull_request.bash
index f3800c8fd..2f700ace4 100755
--- a/source-repo-scripts/release_pull_request.bash
+++ b/source-repo-scripts/release_pull_request.bash
@@ -36,7 +36,10 @@ fi
 
 set -e
 
-CURRENT_BRANCH=$(git branch | sed -n -e 's/^\* \(.*\)/\1/p')
+LOCAL_BRANCH=$(git rev-parse --abbrev-ref  HEAD)
+REMOTE_BRANCH=$(git rev-parse --abbrev-ref  HEAD@{upstream})
+REMOTE=${REMOTE_BRANCH/\/$LOCAL_BRANCH/}
+CURRENT_BRANCH="${REMOTE}:${LOCAL_BRANCH}"
 
 ORIGIN_URL=$(git remote get-url origin)
 ORIGIN_ORG_REPO=$(echo ${ORIGIN_URL} | sed -e 's@.*github\.com.@@' | sed -e 's/\.git//g')
@@ -73,4 +76,5 @@ gh pr create \
     --repo "$ORIGIN_ORG_REPO" \
     --base "$TO_BRANCH" \
     --body "$BODY" \
-    --head "$CURRENT_BRANCH"
+    --head "$CURRENT_BRANCH" \
+    --web