jobs/build-node-image: minor tweaks and fixes

- Prepare yum repos file upfront and feed it to both the node image
  build and the extensions build for consistency. This also avoids the
  subtle `\$(pwd)` usage in the secret argument.
- Tweak the stage names a bit to make them more consistent.
- Fix authfile handling. Don't use `None`; I don't think that's a valid
  Groovy value.

Author: jlebon

jobs/build-node-image.Jenkinsfile

@@ -73,14 +73,21 @@ lock(resource: "build-node-image") {
         // add any additional root CA cert before we do anything that fetches
         pipeutils.addOptionalRootCA()
 
+        def yumrepos_file
         stage('Init') {
-            shwrap("""git clone ${stream_info.yumrepo.url} yumrepos""")
+            shwrap("git clone ${stream_info.yumrepo.url} yumrepos")
+            for (repo in stream_info.yumrepo.files) {
+                shwrap("cat yumrepos/${repo} >> all.repo")
+            }
+            yumrepos_file = shwrapCapture("realpath all.repo")
+            // let's archive it also so it's easy to see what the final repo file looked like
+            archiveArtifacts 'all.repo'
         }
 
         if (params.PIPECFG_HOTFIX_REPO || params.PIPECFG_HOTFIX_REF) {
             container_registry_staging_image_tag += "-hotfix-${pipecfg.hotfix.name}"
         }
-        stage('Build Layered Image') {
+        stage('Build Node Image') {
             withCredentials([file(credentialsId: 'oscontainer-push-registry-secret', variable: 'REGISTRY_AUTH_FILE')]) {
                  def build_from = params.FROM ?: stream_info.from
                  pipeutils.build_and_push_image(arches: arches,
@@ -89,36 +96,32 @@ lock(resource: "build-node-image") {
                                                 staging_repository: container_registry_staging_repo,
                                                 image_tag_staging: container_registry_staging_image_tag,
                                                 manifest_tag_staging: container_registry_staging_manifest_tag,
-                                                secret: "id=yumrepos,src=\$(pwd)/yumrepos/${stream_info.yumrepo.files[0]}",
+                                                secret: "id=yumrepos,src=${yumrepos_file}",
                                                 from: build_from,
                                                 extra_build_args: ["--security-opt label=disable", "--mount-host-ca-certs", "--force"])
             }
         }
-        stage('Build Extensions Container') {
+        stage('Build Extensions Image') {
             withCredentials([file(credentialsId: 'oscontainer-push-registry-secret', variable: 'REGISTRY_AUTH_FILE')]) {
                 // Use the node image as from
                 def build_from = container_registry_staging_manifest
-                def repos = stream_info.yumrepo.files
-                for (repo in repos) {
-                    shwrap(""" cat yumrepos/${repo} >> /tmp/final_repo """)
-                }
                 pipeutils.build_and_push_image(arches: arches,
                                                src_commit: commit,
                                                src_url: src_config_url,
                                                staging_repository: container_registry_staging_repo,
                                                image_tag_staging: "${container_registry_staging_image_tag}-extensions",
                                                manifest_tag_staging: "${container_registry_staging_manifest_tag}-extensions",
-                                               secret: "id=yumrepos,src=/tmp/final_repo",
+                                               secret: "id=yumrepos,src=${yumrepos_file}",
                                                from: build_from,
                                                extra_build_args: ["--security-opt label=disable", "--mount-host-ca-certs",
-                                               "--git-containerfile", "extensions/Dockerfile", "--force"])
+                                                                  "--git-containerfile", "extensions/Dockerfile", "--force"])
             }
         }
         stage("Release Manifests") {
             withCredentials([file(credentialsId: 'oscontainer-push-registry-secret', variable: 'REGISTRY_AUTH_FILE')]) {
-                pipeutils.copy_image(container_registry_staging_manifest, container_registry_repo_and_tag, REGISTRY_AUTH_FILE)
+                pipeutils.copy_image(container_registry_staging_manifest, container_registry_repo_and_tag)
                 pipeutils.copy_image("${container_registry_staging_manifest}-extensions",
-                                     "${container_registry_repo_and_tag}-extensions", REGISTRY_AUTH_FILE)
+                                     "${container_registry_repo_and_tag}-extensions")
             }
         }
         currentBuild.result = 'SUCCESS'

utils.groovy

@@ -835,7 +835,7 @@ def matrixSend(message) {
 }
 
 def build_remote_image(arches, commit, url, repo, tag, secret=None, from=None,
-                        extra_build_args=None) {
+                        extra_build_args = []) {
     def build_args = ["--git-ref", commit, "--git-url", url, "--repo", repo,
                       "--push-to-registry"]
     if (secret) {
@@ -876,25 +876,29 @@ def push_manifest(digests, repo, manifest_tag) {
     }
 }
 
-def copy_image(src_image, dest_image, registry_secret_path=None) {
+def copy_image(src_image, dest_image, authfile = "") {
+    if (authfile != "") {
+        authfile = "--authfile=${authfile}"
+    }
     shwrap("""
-        skopeo copy --all --authfile=${registry_secret_path} \
+        skopeo copy --all ${authfile} \
             docker://${src_image} \
             docker://${dest_image}
     """)
 }
 
-def delete_tags(digests, repo, manifest_tag, registry_secret_path=None) {
+def delete_tags(digests, repo, manifest_tag, authfile = "") {
+    if (authfile != "") {
+        authfile = "--authfile=${authfile}"
+    }
     shwrap("""
         export STORAGE_DRIVER=vfs # https://github.com/coreos/fedora-coreos-pipeline/issues/723#issuecomment-1297668507
-        skopeo delete --authfile=${registry_secret_path} \
-            docker://${repo}:${manifest_tag}
+        skopeo delete ${authfile} docker://${repo}:${manifest_tag}
     """)
     parallel digests.keySet().collectEntries{arch -> [digest, {
         shwrap("""
             export STORAGE_DRIVER=vfs # https://github.com/coreos/fedora-coreos-pipeline/issues/723#issuecomment-1297668507
-            skopeo delete --authfile=${registry_secret_path} \
-                docker://${repo}:${digest}
+            skopeo delete ${authfile} docker://${repo}:${digest}
         """)
     }]}
 }