Merge pull request #967 from lsst-dm/tickets/DM-41172

Default to 'main' branch; reorder push targets

jobs/build_sciplatlab.groovy

@@ -10,8 +10,8 @@ p.pipeline().with {
   parameters {
     stringParam('TAG', null, 'eups distrib tag')
     stringParam('SUPPLEMENTARY', null, 'Supplementary tag for experimental builds')
-    stringParam('IMAGE', 'docker.io/lsstsqre/sciplat-lab,us-central1-docker.pkg.dev/rubin-shared-services-71ec/sciplat/sciplat-lab,ghcr.io/lsst-sqre/sciplat-lab', 'Fully-qualified URI(s) for Docker target image(s, comma-separated)')
+    stringParam('IMAGE', 'us-central1-docker.pkg.dev/rubin-shared-services-71ec/sciplat/sciplat-lab,ghcr.io/lsst-sqre/sciplat-lab,docker.io/lsstsqre/sciplat-lab', 'Fully-qualified URI(s) for Docker target image(s, comma-separated)')
     booleanParam('NO_PUSH', false, 'Do not push image to docker registr(y/ies)')
-    stringParam('BRANCH', 'prod', 'Branch from which to build image')
+    stringParam('BRANCH', 'main', 'Branch from which to build image')
   }
 }

pipelines/sqre/infra/build_sciplatlab.groovy

@@ -71,9 +71,9 @@ notify.wrap {
       // We presume that GH Actions will continue to list most recent runs
       // at the top.  Poll the build.yaml runs for the first result.
 
-      // I think we always want the prod branch.
+      // I think we always want the main branch.
 
-      def url = new URL("https://api.github.com/repos/lsst-sqre/sciplat-lab/actions/workflows/build.yaml/runs?per_page=1&branch=prod")
+      def url = new URL("https://api.github.com/repos/lsst-sqre/sciplat-lab/actions/workflows/build.yaml/runs?per_page=1&branch=main")
 
       def created_at = starttime.minusSeconds(1)
       // One second before we really started the action.