Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use stable branches for gz-rendering and sdformat #995

Merged
merged 1 commit into from
Aug 29, 2023

Conversation

azeey
Copy link
Contributor

@azeey azeey commented Aug 29, 2023

Part of #974

@azeey azeey requested a review from j-rivero as a code owner August 29, 2023 18:50
@azeey azeey requested a review from iche033 August 29, 2023 19:35
@azeey
Copy link
Contributor Author

azeey commented Aug 29, 2023

Diff

Only in /tmp/pr_xml_configuration: gz_rendering-ci-gz-rendering8-jammy-amd64.xml
Only in /tmp/current_xml_configuration: gz_rendering-ci-main-jammy-amd64.xml
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_rendering-ci-pr_any-jammy-amd64.xml /tmp/pr_xml_configuration/gz_rendering-ci-pr_any-jammy-amd64.xml
--- /tmp/current_xml_configuration/gz_rendering-ci-pr_any-jammy-amd64.xml	2023-08-29 18:52:45.665531149 +0000
+++ /tmp/pr_xml_configuration/gz_rendering-ci-pr_any-jammy-amd64.xml	2023-08-29 18:50:58.684831570 +0000
@@ -53,7 +53,7 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
-                    <branch>main</branch>
+                    <branch>gz-rendering8</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
             </whiteListTargetBranches>
             <triggerPhrase>.*(re)?run test(s).*</triggerPhrase>
Only in /tmp/pr_xml_configuration: gz_rendering8-install-pkg-focal-amd64.xml
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/ign-harmonic.xml /tmp/pr_xml_configuration/ign-harmonic.xml
--- /tmp/current_xml_configuration/ign-harmonic.xml	2023-08-29 18:54:08.958054982 +0000
+++ /tmp/pr_xml_configuration/ign-harmonic.xml	2023-08-29 18:52:22.317377929 +0000
@@ -29,7 +29,7 @@
         <string>gz_msgs-ci-gz-msgs10-jammy-amd64</string>
         <string>gz_physics-ci-gz-physics6-jammy-amd64</string>
         <string>gz_plugin-ci-gz-plugin2-jammy-amd64</string>
-        <string>gz_rendering-ci-main-jammy-amd64</string>
+        <string>gz_rendering-ci-gz-rendering8-jammy-amd64</string>
         <string>gz_sensors-ci-main-jammy-amd64</string>
         <string>gz_sim-ci-main-jammy-amd64</string>
         <string>gz_tools-ci-gz-tools2-jammy-amd64</string>
@@ -45,7 +45,7 @@
         <string>ign_msgs-gz-10-win</string>
         <string>ign_physics-gz-6-win</string>
         <string>ign_plugin-gz-2-win</string>
-        <string>ign_rendering-ci-win</string>
+        <string>ign_rendering-gz-8-win</string>
         <string>ign_sensors-ci-win</string>
         <string>ign_tools-gz-2-win</string>
         <string>ign_transport-gz-13-win</string>
@@ -61,14 +61,14 @@
         <string>ignition_msgs-ci-gz-msgs10-homebrew-amd64</string>
         <string>ignition_physics-ci-gz-physics6-homebrew-amd64</string>
         <string>ignition_plugin-ci-gz-plugin2-homebrew-amd64</string>
-        <string>ignition_rendering-ci-main-homebrew-amd64</string>
+        <string>ignition_rendering-ci-gz-rendering8-homebrew-amd64</string>
         <string>ignition_sensors-ci-main-homebrew-amd64</string>
         <string>ignition_tools-ci-gz-tools2-homebrew-amd64</string>
         <string>ignition_transport-ci-gz-transport13-homebrew-amd64</string>
         <string>ignition_utils-ci-gz-utils2-homebrew-amd64</string>
-        <string>sdformat-ci-main-homebrew-amd64</string>
-        <string>sdformat-ci-main-jammy-amd64</string>
-        <string>sdformat-sdf-main-win</string>
+        <string>sdformat-ci-sdformat14-homebrew-amd64</string>
+        <string>sdformat-ci-sdformat14-jammy-amd64</string>
+        <string>sdformat-sdf-14-win</string>
         <string>sdformat14-debbuilder</string>
     </jobNames>
     <jobFilters></jobFilters>
Only in /tmp/pr_xml_configuration: ign_rendering-gz-8-win.xml
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/ignition-harmonic-nightly-scheduler.xml /tmp/pr_xml_configuration/ignition-harmonic-nightly-scheduler.xml
--- /tmp/current_xml_configuration/ignition-harmonic-nightly-scheduler.xml	2023-08-29 18:54:08.442051611 +0000
+++ /tmp/pr_xml_configuration/ignition-harmonic-nightly-scheduler.xml	2023-08-29 18:52:21.797374157 +0000
@@ -98,11 +98,11 @@
     elif [[ "${n}" != "${n/plugin/}" ]]; then
       src_branch="gz-plugin2"
     elif [[ "${n}" != "${n/rendering/}" ]]; then
-      src_branch="main"
+      src_branch="gz-rendering8"
     elif [[ "${n}" != "${n/sensors/}" ]]; then
       src_branch="main"
     elif [[ "${n}" != "${n/sdformat/}" ]]; then
-      src_branch="main"
+      src_branch="sdf14"
     elif  [[ "${n}" != "${n/sim/}" ]]; then
       src_branch="main"
     elif [[ "${n}" != "${n/transport/}" ]]; then
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/ignition_rendering-abichecker-any_to_any-ubuntu_auto-amd64.xml /tmp/pr_xml_configuration/ignition_rendering-abichecker-any_to_any-ubuntu_auto-amd64.xml
--- /tmp/current_xml_configuration/ignition_rendering-abichecker-any_to_any-ubuntu_auto-amd64.xml	2023-08-29 18:53:10.489690370 +0000
+++ /tmp/pr_xml_configuration/ignition_rendering-abichecker-any_to_any-ubuntu_auto-amd64.xml	2023-08-29 18:51:23.269010968 +0000
@@ -81,6 +81,9 @@
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>gz-rendering7</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
+                <org.jenkinsci.plugins.ghprb.GhprbBranch>
+                    <branch>gz-rendering8</branch>
+                </org.jenkinsci.plugins.ghprb.GhprbBranch>
             </whiteListTargetBranches>
             <triggerPhrase>.*(re)?run test(s).*</triggerPhrase>
             <extensions>
Only in /tmp/pr_xml_configuration: ignition_rendering-ci-gz-rendering8-focal-amd64.xml
Only in /tmp/pr_xml_configuration: ignition_rendering-ci-gz-rendering8-homebrew-amd64.xml
Only in /tmp/pr_xml_configuration: ignition_rendering-ci_asan-gz-rendering8-focal-amd64.xml
Only in /tmp/pr_xml_configuration: ignition_rendering8-install_bottle-homebrew-amd64.xml
Only in /tmp/current_xml_configuration: sdformat-ci-main-jammy-amd64.xml
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/sdformat-ci-pr_any-jammy-amd64.xml /tmp/pr_xml_configuration/sdformat-ci-pr_any-jammy-amd64.xml
--- /tmp/current_xml_configuration/sdformat-ci-pr_any-jammy-amd64.xml	2023-08-29 18:52:45.937532901 +0000
+++ /tmp/pr_xml_configuration/sdformat-ci-pr_any-jammy-amd64.xml	2023-08-29 18:50:58.948832935 +0000
@@ -53,7 +53,7 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
-                    <branch>main</branch>
+                    <branch>sdf14</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
             </whiteListTargetBranches>
             <triggerPhrase>.*(re)?run test(s).*</triggerPhrase>
Only in /tmp/pr_xml_configuration: sdformat-ci-sdf14-jammy-amd64.xml

@iche033 iche033 merged commit 8f7ee4c into master Aug 29, 2023
@iche033 iche033 deleted the azeey/rendering_sdformat_stable branch August 29, 2023 20:50
@@ -58,4 +61,5 @@ gh pr create \
--repo "$ORIGIN_ORG_REPO" \
--base "$TO_BRANCH" \
--body "$BODY" \
--head "$CURRENT_BRANCH"
--head "$CURRENT_BRANCH" \
--web
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this script doesn't work well for me anymore since these changes, using the latest gh from homebrew. It used to just open the pull request with the body completely filled out, but now it opens a web browser without filling in everything. @azeey which version of gh have you tested with?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have 2.27.0. I didn't actually mean to make this change in this PR, so we can remove it if it's not working for you. I do like the --web flag though, since I can review the PR body/title before creating it or avoid accidentally creating PRs.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants