Bug 1597928 - Snap repackage: Stop fetching scripts from the hg.mozilla.org archive endpoint. r=jlund, a=release DONTBUILD
authorJohan Lorenzo <jlorenzo@mozilla.com>
Wed, 20 Nov 2019 13:09:39 +0000
changeset 524149 a012a7ee41b79777facd8fc65a14d52c097ffb38
parent 524148 426e37b06a7572bde09729af13f7967e89384abf
child 524150 ee87784c3e04da20fea8ab442584694b27cbfe6e
push id620
push userjcristau@mozilla.com
push dateFri, 22 Nov 2019 13:28:25 +0000
treeherdermozilla-esr68@a012a7ee41b7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjlund, release
bugs1597928
milestone68.3.0
Bug 1597928 - Snap repackage: Stop fetching scripts from the hg.mozilla.org archive endpoint. r=jlund, a=release DONTBUILD Differential Revision: https://phabricator.services.mozilla.com/D53933
taskcluster/ci/release-snap-repackage/kind.yml
taskcluster/docker/firefox-snap/Dockerfile
--- a/taskcluster/ci/release-snap-repackage/kind.yml
+++ b/taskcluster/ci/release-snap-repackage/kind.yml
@@ -30,22 +30,17 @@ job-defaults:
         docker-image: {in-tree: firefox-snap}
         artifacts:
             - name: public/build
               type: directory
               path: /home/worker/artifacts/
         command:
             - /bin/bash
             - -cx
-            - >
-              curl -o scripts.tar.bz2 {config_params[head_repository]}/archive/{config_params[head_rev]}.tar.bz2/taskcluster/docker/firefox-snap/ &&
-              mkdir scripts &&
-              tar xvfj scripts.tar.bz2 -C scripts --strip-components 4 &&
-              cd scripts &&
-              ./runme.sh
+            - ./runme.sh
         env:
             VERSION: "{release_config[version]}"
             BUILD_NUMBER: "{release_config[build_number]}"
             CANDIDATES_DIR:
                 by-release-level:
                     staging:
                         https://net-mozaws-stage-delivery-firefox.s3.amazonaws.com/pub/{task[shipping-product]}/candidates
                     production:
--- a/taskcluster/docker/firefox-snap/Dockerfile
+++ b/taskcluster/docker/firefox-snap/Dockerfile
@@ -1,6 +1,16 @@
 FROM snapcore/snapcraft:stable
 
 RUN apt-get update && apt-get install -qy python3 bzip2 curl git && apt-get clean
 
+RUN mkdir /scripts/
+WORKDIR /scripts/
+# Copy everything in the docker/firefox-snap folder but the Dockerfile
+#
+# XXX The following pattern is neither a regex nor a glob one. It's
+# documented at https://golang.org/pkg/path/filepath/#Match. There's no
+# way of explicitly filtering out "Dockerfile". If one day, someone needs
+# to add a file starting with "D", then we must revisit the pattern below.
+COPY [^D]* /scripts/
+
 # Set a default command useful for debugging
 CMD ["/bin/bash", "--login"]