Taskgraph follow-up fixes (#162)

* Fix issues in .taskcluster.yml

Raise level to 3 when appropriate to match ci-config; build for master/dev/production.

* Fix some bugs in push_images.sh

I missed a few things here:
* Fix secret parsing
* Create archive tag in addition to branch tag
* We need the version to create the archive tag properly
* Typo (GIT_HEAD_REV vs VCS_HEAD_REV)

.taskcluster.yml

@@ -12,7 +12,7 @@ policy:
 tasks:
     - $let:
           trustDomain: "releng"
-          level: "1"
+          level: "3"
           ownerEmail:
               $switch:
                   'tasks_for == "github-push"': '${event.pusher.email}'
@@ -83,10 +83,14 @@ tasks:
               $eval: 'tasks_for[:19] == "github-pull-request"'
       in:
           $let:
+              level:
+                  $if: 'tasks_for in ["github-release", "github-push", "cron", "action"] && repoUrl == "https://github.com/mozilla-releng/k8s-autoscale"'
+                  then: 3
+                  else: 1
               short_base_ref:
                   $switch:
                       'base_ref[:10] == "refs/tags/"': '${base_ref[10:]}'
-                      'base_ref[:11] == "refs/heads/"': '${$base_ref[11:]}'
+                      'base_ref[:11] == "refs/heads/"': '${base_ref[11:]}'
                       $default: '${base_ref}'
               short_head_ref:
                   $switch:
@@ -96,7 +100,7 @@ tasks:
           in:
               $if: >
                   tasks_for in ["action", "pr-action", "cron"]
-                  || (tasks_for == "github-push" && short_head_ref == "main")
+                  || (tasks_for == "github-push" && (short_head_ref in ["master", "dev", "production"]))
                   || (isPullRequest && pullRequestAction in ["opened", "reopened", "synchronize"])
               then:
                   taskId: {$if: 'tasks_for != "action" && tasks_for != "pr-action"', then: '${ownTaskId}'}

taskcluster/docker/skopeo/Dockerfile

@@ -30,6 +30,8 @@ RUN ["/usr/local/go/bin/go", "build", \
 FROM debian:buster
 
 # %include-run-task
+# %include version.txt
+COPY topsrcdir/version.txt /version.txt
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update -qq \

taskcluster/docker/skopeo/push_image.sh

@@ -3,6 +3,7 @@ set -e
 
 export
 test $DOCKER_REPO
+test $DOCKER_TAG
 test $MOZ_FETCHES_DIR
 test $SECRET_URL
 test $TASKCLUSTER_ROOT_URL
@@ -35,12 +36,16 @@ then
 else
     echo "=== Generating dockercfg ==="
     install -m 600 /dev/null $HOME/.dockercfg
-    curl $SECRET_URL | jq '.secret.dockercfg' > $HOME/.dockercfg
+    curl $SECRET_URL | jq '.secret.docker.dockercfg' > $HOME/.dockercfg
 
     echo "=== Pushing to docker hub ==="
-    DOCKER_TAG="${DOCKER_TAG}-$(cat ./version.txt)-$(date +%Y%m%d%H%M%S)-${GIT_HEAD_REV}"
+    APP_VERSION="$(cat /version.txt)"
+    DOCKER_TAG="$(echo ${DOCKER_TAG} | cut -f3 -d/)"
+    DOCKER_ARCHIVE_TAG="${DOCKER_TAG}-${APP_VERSION}-$(date +%Y%m%d%H%M%S)-${VCS_HEAD_REV}"
     skopeo copy oci:k8s_autoscale:final docker://$DOCKER_REPO:$DOCKER_TAG
     skopeo inspect docker://$DOCKER_REPO:$DOCKER_TAG
+    skopeo copy oci:k8s_autoscale:final docker://$DOCKER_REPO:$DOCKER_ARCHIVE_TAG
+    skopeo inspect docker://$DOCKER_REPO:$DOCKER_ARCHIVE_TAG
 fi
 
 echo "=== Clean up ==="