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

Change abichecker generation to use gz-collection.yaml #1038

Merged
merged 22 commits into from
Oct 17, 2023

Conversation

j-rivero
Copy link
Contributor

Modify the abichecker job generation to use the new static configuration. Steps done:

  1. Update abichecker to work with gz-* and Rename abichecker bash script to gz
  2. Implement gazebo_libs jobs for abichecker
  3. Return true from all ignition abichecker previous jobs
  4. Manage excluding jobs by: Move exclude to an all category and Add excludes for abichecker.

Diff from existing gz-physics-abichecker (focal) to the new one (jammy):

-- ignition_physics-abichecker-any_to_any-ubuntu_auto-amd64.xml	2023-10-12 23:40:39.121096682 +0200
+++ /home/jrivero/code/release-tools/jenkins-scripts/dsl/gz_physics-abichecker-any_to_any-ubuntu-jammy-amd64.xml	2023-10-12 23:04:47.129930896 +0200
@@ -73,15 +73,6 @@
             <cron></cron>
             <whiteListTargetBranches>
                 <org.jenkinsci.plugins.ghprb.GhprbBranch>
-                    <branch>ign-physics2</branch>
-                </org.jenkinsci.plugins.ghprb.GhprbBranch>
-                <org.jenkinsci.plugins.ghprb.GhprbBranch>
-                    <branch>ign-physics5</branch>
-                </org.jenkinsci.plugins.ghprb.GhprbBranch>
-                <org.jenkinsci.plugins.ghprb.GhprbBranch>
-                    <branch>gz-physics6</branch>
-                </org.jenkinsci.plugins.ghprb.GhprbBranch>
-                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                     <branch>gz-physics7</branch>
                 </org.jenkinsci.plugins.ghprb.GhprbBranch>
             </whiteListTargetBranches>
@@ -144,26 +135,25 @@
             </source>
         </hudson.plugins.groovy.SystemGroovy>
         <hudson.tasks.Shell>
-            <command>                #!/bin/bash -xe
+            <command>#!/bin/bash -xe
+
+export DISTRO=jammy
 
-                export DISTRO=focal
 
-                
-                
 export MAKE_JOBS=1
 
-                export ARCH=amd64
-                export DEST_BRANCH=${DEST_BRANCH:-$ghprbTargetBranch}
-                export SRC_BRANCH=${SRC_BRANCH:-$ghprbSourceBranch}
-                export SRC_REPO=${SRC_REPO:-$ghprbAuthorRepoGitUrl}
-                export ABI_JOB_SOFTWARE_NAME=ign-physics
-                /bin/bash -xe ./scripts/jenkins-scripts/docker/ignition-abichecker.bash
-                </command>
+export ARCH=amd64
+export DEST_BRANCH=${DEST_BRANCH:-$ghprbTargetBranch}
+export SRC_BRANCH=${SRC_BRANCH:-$ghprbSourceBranch}
+export SRC_REPO=${SRC_REPO:-$ghprbAuthorRepoGitUrl}
+export ABI_JOB_SOFTWARE_NAME=gz-physics
+/bin/bash -xe ./scripts/jenkins-scripts/docker/gz-abichecker.bash
+</command>
         </hudson.tasks.Shell>
     </builders>
     <publishers>
         <hudson.plugins.emailext.ExtendedEmailPublisher>
-            <recipientList>$DEFAULT_RECIPIENTS, caguero@osrfoundation.org</recipientList>
+            <recipientList>$DEFAULT_RECIPIENTS</recipientList>
             <configuredTriggers>
                 <hudson.plugins.emailext.plugins.trigger.FailureTrigger>
                     <email>
@@ -412,7 +402,7 @@
         <gitTool>Default</gitTool>
         <extensions>
             <hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
-                <relativeTargetDir>ign-physics</relativeTargetDir>
+                <relativeTargetDir>gz-physics</relativeTargetDir>
             </hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
         </extensions>
         <browser class='hudson.plugins.git.browser.GithubWeb'>

j-rivero and others added 12 commits October 12, 2023 22:55
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
… being active (#1032)

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
@j-rivero j-rivero force-pushed the jrivero/abichecker-static-doc branch from fc2bb5f to 01b6341 Compare October 16, 2023 15:01
Copy link
Contributor

@azeey azeey left a comment

Choose a reason for hiding this comment

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

Are all the abichecker jobs using the gz prefix now? I see ign_*.xml files in /tmp/pr_xml_configuration, so I wasn't sure.

Also, I'm seeing abi jobs for each platform (e.g. gz_sim-abichecker-any_to_any-ubuntu-focal-amd64.xml,
gz_sim-abichecker-any_to_any-ubuntu-jammy-amd64.xml). I think we only need one.

jenkins-scripts/docker/gz-abichecker.bash Outdated Show resolved Hide resolved
jenkins-scripts/docker/gz-abichecker.bash Show resolved Hide resolved
jenkins-scripts/docker/gz-abichecker.bash Show resolved Hide resolved
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
@j-rivero j-rivero force-pushed the jrivero/abichecker-static-doc branch from 3ce3bbf to dd865de Compare October 16, 2023 16:17
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Mostly libs duplicated from Garden in Harmonic.

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
@j-rivero
Copy link
Contributor Author

Are all the abichecker jobs using the gz prefix now? > I see ign_*.xml files in /tmp/pr_xml_configuration, so I wasn't sure.

The names are using the lib names defined in the yaml file. Citadel is using the ign- prefix but all others are using the gz- now.

Also, I'm seeing abi jobs for each platform (e.g. gz_sim-abichecker-any_to_any-ubuntu-focal-amd64.xml, gz_sim-abichecker-any_to_any-ubuntu-jammy-amd64.xml). I think we only need one.

Good catch. To workaround this, I've excluded manually the libs in the yaml file in d996eb9 and added a CI test for it. I would prefer to solve this in a declarative way instead of coding a hidden solver for it. The rest of jobs listed here that runs on different platforms they are supporting different branches should be fine and needed to have them.

@j-rivero
Copy link
Contributor Author

Log is a mix of tabs diffs (introduce quite a lot of noise but the change needed was a bug fix), legitim old jobs change configuration and reports of new jobs present only in the PR. Can not find anything abnormal.

@azeey
Copy link
Contributor

azeey commented Oct 16, 2023

Looking at the trigger branches, for example in gz_transport-abichecker-...focal-amd.xml, I see

            <whiteListTargetBranches>
                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                    <branch>gz-transport11</branch>
                </org.jenkinsci.plugins.ghprb.GhprbBranch>
                <org.jenkinsci.plugins.ghprb.GhprbBranch>
                    <branch>gz-transport12</branch>
                </org.jenkinsci.plugins.ghprb.GhprbBranch>
            </whiteListTargetBranches>

But the gz-transport11 branch doesn't exist on github. It should be ign-transport11.

@j-rivero
Copy link
Contributor Author

But the gz-transport11 branch doesn't exist on github. It should be ign-transport11.

Should be fixed by #1040

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
@j-rivero j-rivero force-pushed the jrivero/abichecker-static-doc branch from 95eb32f to 267a580 Compare October 17, 2023 12:09
@j-rivero j-rivero merged commit 5894221 into master Oct 17, 2023
1 check passed
@j-rivero j-rivero deleted the jrivero/abichecker-static-doc branch October 17, 2023 13:55
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.

2 participants