sdformat-abichecker: set GZDEV_PROJECT_NAME (#589)

* sdformat-abichecker: set GZDEV_PROJECT_NAME Needed by gazebosim/sdformat#780 Signed-off-by: Steve Peters <[email protected]> * detect_ci_matching_branch: use format() This is compatible with more verisons of python3. Signed-off-by: Steve Peters <[email protected]>
gazebo-tooling · Dec 10, 2021 · 47fb17b · 47fb17b
1 parent f83b2db
commit 47fb17b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/jenkins-scripts/docker/sdformat-abichecker.bash b/jenkins-scripts/docker/sdformat-abichecker.bash
@@ -22,7 +22,11 @@ export ABI_JOB_PKG_DEPENDENCIES_VAR_NAME="SDFORMAT_BASE_DEPENDENCIES"
 if [[ ${SDFORMAT_MAJOR_VERSION} -ge 8 ]]; then
   export NEED_C17_COMPILER=true
 fi
-
+
+# default to use stable repos
 export ABI_JOB_REPOS="stable"
 
+# set GZDEV_PROJECT_NAME so it can override repos if necessary
+export GZDEV_PROJECT_NAME=${ABI_JOB_SOFTWARE_NAME}${SDFORMAT_MAJOR_VERSION}
+
 . ${SCRIPT_DIR}/lib/generic-abi-base.bash
diff --git a/jenkins-scripts/tools/detect_ci_matching_branch.py b/jenkins-scripts/tools/detect_ci_matching_branch.py
@@ -4,7 +4,7 @@
 import sys
 
 if len(sys.argv) != 2:
-    print('need to branch name', file=sys.stderr)
+    print('need to specify branch name', file=sys.stderr)
     exit()
 branchName = sys.argv[1]
 
@@ -13,4 +13,4 @@
 if match:
     print(f"{branchName} matches {pattern}")
 else:
-    sys.exit(f"{branchName} does not match {pattern}")
+    sys.exit("{} does not match {}".format(branchName, pattern))