Bug 1266039 - Generate release promotion specific docker images as a …

…part of release promotion process r=Callek a=release DONTBUILD MozReview-Commit-ID: 89FYuMZYb6a
iaxat · Apr 20, 2016 · 19b6dfd · 19b6dfd
1 parent b4a3ac5
commit 19b6dfd
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/release/docker/beet-mover/Dockerfile b/release/docker/beet-mover/Dockerfile
@@ -18,4 +18,5 @@ RUN apt-get -q update \
 
 COPY requirements.txt /tmp/
 RUN pip install -r /tmp/requirements.txt
-RUN freshclam --verbose
+# Freshclam may be flaky, retry if it fails
+RUN for i in 1 2 3 4 5; do freshclam --verbose && break || sleep 15; done
diff --git a/release/docker/funsize-update-generator/Dockerfile b/release/docker/funsize-update-generator/Dockerfile
@@ -24,7 +24,8 @@ COPY runme.sh /runme.sh
 RUN chmod 755 /home/worker/bin/* /runme.sh
 RUN mkdir /home/worker/keys
 COPY *.pubkey /home/worker/keys/
-RUN freshclam --verbose
+# Freshclam may be flaky, retry if it fails
+RUN for i in 1 2 3 4 5; do freshclam --verbose && break || sleep 15; done
 
 ENV           HOME          /home/worker
 ENV           SHELL         /bin/bash

diff --git a/release/docker/funsize-update-generator/runme.sh b/release/docker/funsize-update-generator/runme.sh
@@ -14,9 +14,8 @@ curl --location --retry 10 --retry-delay 10 -o /home/worker/task.json \
 # enable locale cache
 export MBSDIFF_HOOK="/home/worker/bin/mbsdiff_hook.sh -c /tmp/fs-cache"
 
-EXTRA_PARAMS=
 if [ ! -z $FILENAME_TEMPLATE ]; then
-    EXTRA_PARAMS="--filename-template $FILENAME_TEMPLATE"
+    EXTRA_PARAMS="--filename-template $FILENAME_TEMPLATE $EXTRA_PARAMS"
 fi
 
 /home/worker/bin/funsize.py \

diff --git a/release/docker/funsize-update-generator/scripts/funsize.py b/release/docker/funsize-update-generator/scripts/funsize.py
@@ -170,6 +170,8 @@ def main():
                         type=argparse.FileType('r'))
     parser.add_argument("--filename-template",
                         default=DEFAULT_FILENAME_TEMPLATE)
+    parser.add_argument("--no-freshclam", action="store_true", default=False,
+                        help="Do not refresh ClamAV DB")
     parser.add_argument("-q", "--quiet", dest="log_level",
                         action="store_const", const=logging.WARNING,
                         default=logging.DEBUG)
@@ -180,13 +182,16 @@ def main():
     task = json.load(args.task_definition)
     # TODO: verify task["extra"]["funsize"]["partials"] with jsonschema
 
-    log.info("Refreshing clamav db...")
-    try:
-        redo.retry(lambda:
-                   sh.freshclam("--stdout", "--verbose", _timeout=300, _err_to_out=True))
-        log.info("Done.")
-    except sh.ErrorReturnCode:
-        log.warning("Freshclam failed, skipping DB update")
+    if args.no_freshclam:
+        log.info("Skipping freshclam")
+    else:
+        log.info("Refreshing clamav db...")
+        try:
+            redo.retry(lambda:
+                    sh.freshclam("--stdout", "--verbose", _timeout=300, _err_to_out=True))
+            log.info("Done.")
+        except sh.ErrorReturnCode:
+            log.warning("Freshclam failed, skipping DB update")
     manifest = []
     for e in task["extra"]["funsize"]["partials"]:
         for mar in (e["from_mar"], e["to_mar"]):