Bug 1765759 - Removing SAW docker from the NSS build system. r=nss-reviewers,jschanck

Differential Revision: https://phabricator.services.mozilla.com/D160237

5 files changed, 0 insertions, 143 deletions

diff --git a/automation/taskcluster/docker-saw/Dockerfile b/automation/taskcluster/docker-saw/Dockerfile
deleted file mode 100644
index d67787010..000000000
--- a/automation/taskcluster/docker-saw/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM ubuntu:16.04
-MAINTAINER Tim Taubert <ttaubert@mozilla.com>
-
-RUN useradd -d /home/worker -s /bin/bash -m worker
-WORKDIR /home/worker
-
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get update && apt-get install -y \
-    binutils \
-    build-essential \
-    bzip2 \
-    clang-3.8 \
-    curl \
-    gcc-multilib \
-    g++-multilib \
-    gyp \
-    lib32z1-dev \
-    mercurial \
-    ninja-build \
-    unzip \
-    zlib1g-dev
-
-# Add missing LLVM plugin for gold linker.
-ADD LLVMgold.so.zip /usr/lib/llvm-3.8/lib/LLVMgold.so.zip
-RUN unzip /usr/lib/llvm-3.8/lib/LLVMgold.so.zip -d /usr/lib/llvm-3.8/lib/
-
-# Install SAW/Cryptol.
-RUN curl -LO https://saw.galois.com/builds/nightly/saw-0.2-2018-01-14-Ubuntu14.04-64.tar.gz && \
-    tar xzvf saw-*.tar.gz -C /usr/local --strip-components=1 && \
-    rm saw-*.tar.gz
-
-# Install Z3.
-RUN curl -LO https://github.com/Z3Prover/z3/releases/download/z3-4.6.0/z3-4.6.0-x64-ubuntu-16.04.zip && \
-    unzip z3*.zip && \
-    cp -r z3*/* /usr/local/ && \
-    rm -fr z3*
-
-ADD bin /home/worker/bin
-RUN chmod +x /home/worker/bin/*
-
-# Change user.
-USER worker
-
-# Set a default command useful for debugging
-CMD ["/bin/bash", "--login"]
diff --git a/automation/taskcluster/docker-saw/LLVMgold.so.zip b/automation/taskcluster/docker-saw/LLVMgold.so.zip
deleted file mode 100644
index b5e5a593d..000000000
--- a/automation/taskcluster/docker-saw/LLVMgold.so.zip
+++ /dev/null
diff --git a/automation/taskcluster/docker-saw/bin/checkout.sh b/automation/taskcluster/docker-saw/bin/checkout.sh
deleted file mode 100644
index 0cdd2ac40..000000000
--- a/automation/taskcluster/docker-saw/bin/checkout.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-set -v -e -x
-
-# Default values for testing.
-REVISION=${NSS_HEAD_REVISION:-default}
-REPOSITORY=${NSS_HEAD_REPOSITORY:-https://hg.mozilla.org/projects/nss}
-
-# Clone NSS.
-for i in 0 2 5; do
-    sleep $i
-    hg clone -r $REVISION $REPOSITORY nss && exit 0
-    rm -rf nss
-done
-exit 1
diff --git a/automation/taskcluster/graph/src/extend.js b/automation/taskcluster/graph/src/extend.js
index 0f2498bb2..f354f7f73 100644
--- a/automation/taskcluster/graph/src/extend.js
+++ b/automation/taskcluster/graph/src/extend.js
@@ -41,11 +41,6 @@ const FUZZ_IMAGE_32 = {
   path: "automation/taskcluster/docker-fuzz32"
 };
 
-const SAW_IMAGE = {
-  name: "saw",
-  path: "automation/taskcluster/docker-saw"
-};
-
 const WINDOWS_CHECKOUT_CMD =
   "bash -c \"hg clone -r $NSS_HEAD_REVISION $NSS_HEAD_REPOSITORY nss || " +
     "(sleep 2; hg clone -r $NSS_HEAD_REVISION $NSS_HEAD_REPOSITORY nss) || " +
@@ -1189,74 +1184,6 @@ async function scheduleTools() {
     ]
   }));
 
-  let task_saw = queue.scheduleTask(merge(base, {
-    symbol: "B",
-    group: "SAW",
-    name: "LLVM bitcode build (32 bit)",
-    image: SAW_IMAGE,
-    kind: "build",
-    env: {
-      AR: "llvm-ar-3.8",
-      CC: "clang-3.8",
-      CCC: "clang++-3.8"
-    },
-    artifacts: {
-      public: {
-        expires: 24 * 7,
-        type: "directory",
-        path: "/home/worker/artifacts"
-      }
-    },
-    command: [
-      "/bin/bash",
-      "-c",
-      "bin/checkout.sh && nss/automation/taskcluster/scripts/build_gyp.sh --disable-tests --emit-llvm -t ia32"
-    ]
-  }));
-
-  queue.scheduleTask(merge(base, {
-    parent: task_saw,
-    symbol: "bmul",
-    group: "SAW",
-    name: "bmul.saw",
-    image: SAW_IMAGE,
-    command: [
-      "/bin/bash",
-      "-c",
-      "bin/checkout.sh && nss/automation/taskcluster/scripts/run_saw.sh bmul"
-    ]
-  }));
-
-  // TODO: The ChaCha20 saw verification is currently disabled because the new
-  //       HACL 32-bit code can't be verified by saw right now to the best of
-  //       my knowledge.
-  //       Bug 1604130
-  // queue.scheduleTask(merge(base, {
-  //   parent: task_saw,
-  //   symbol: "ChaCha20",
-  //   group: "SAW",
-  //   name: "chacha20.saw",
-  //   image: SAW_IMAGE,
-  //   command: [
-  //     "/bin/bash",
-  //     "-c",
-  //     "bin/checkout.sh && nss/automation/taskcluster/scripts/run_saw.sh chacha20"
-  //   ]
-  // }));
-
-  queue.scheduleTask(merge(base, {
-    parent: task_saw,
-    symbol: "Poly1305",
-    group: "SAW",
-    name: "poly1305.saw",
-    image: SAW_IMAGE,
-    command: [
-      "/bin/bash",
-      "-c",
-      "bin/checkout.sh && nss/automation/taskcluster/scripts/run_saw.sh poly1305"
-    ]
-  }));
-
   queue.scheduleTask(merge(base, {
     symbol: "Coverage",
     name: "Coverage",
diff --git a/automation/taskcluster/scripts/run_saw.sh b/automation/taskcluster/scripts/run_saw.sh
deleted file mode 100755
index 0e9a8224a..000000000
--- a/automation/taskcluster/scripts/run_saw.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-source $(dirname "$0")/tools.sh
-
-# Fetch artifact if needed.
-fetch_dist
-
-# Run SAW.
-saw "nss/automation/saw/$1.saw"