Merge pull request #58 from mwestphall/SOFTWARE-5722-htcondor-rc-repos

SOFTWARE-5722: include htcondor rc repos in osg-testing

bin/pull_condor_rpms.sh

@@ -50,26 +50,31 @@ esac
 case $BRANCH in
     main ) 
         CONDOR_SERIES=$SERIES.0 
-        TESTING_CONDOR_REPO=release ;;
+        TESTING_CONDOR_REPOS=(release rc);;
     upcoming ) CONDOR_SERIES=$SERIES.x
-        TESTING_CONDOR_REPO=update ;;
+        TESTING_CONDOR_REPOS=(release rc update) ;;
     * ) branch_not_supported $BRANCH ;;
 esac
 
 # OSG repos correspond to the condor repos in the following way:
 # release -> release
-# testing -> release, rc, update
+# testing -> release and rc (23.0 and 23.x), update (23.x only)
 # development -> daily
 case $REPO in
-    release ) CONDOR_REPO=release ;;
-    testing ) CONDOR_REPO=$TESTING_CONDOR_REPO ;;
-    development ) CONDOR_REPO=daily ;;
+    release ) CONDOR_REPOS=(release) ;;
+    testing ) CONDOR_REPOS=(${TESTING_CONDOR_REPOS[@]}) ;;
+    development ) CONDOR_REPOS=(daily) ;;
     * ) repo_not_supported $REPO ;;
 esac
 
 # get every build available for that package from every applicable condor repo
-RSYNC_URL="$RSYNC_ROOT/$CONDOR_SERIES/$DVER/x86_64/$CONDOR_REPO/$SOURCE_SET*.rpm"
-echo "rsyncing $RSYNC_URL to $NEW_REPO_DIR"
-if ! rsync --times $RSYNC_URL $NEW_REPO_DIR --link-dest $CURRENT_REPO_DIR; then
+
+mkdir -p $CURRENT_REPO_DIR
+
+for CONDOR_REPO in ${CONDOR_REPOS[@]}; do
+  RSYNC_URL="$RSYNC_ROOT/$CONDOR_SERIES/$DVER/x86_64/$CONDOR_REPO/$SOURCE_SET*.rpm"
+  echo "rsyncing $RSYNC_URL to $NEW_REPO_DIR"
+  if ! rsync --times $RSYNC_URL $NEW_REPO_DIR --link-dest $CURRENT_REPO_DIR; then
     echo "Warning: No packages found for $RSYNC_URL. Skipping"
-fi
+  fi
+done