From fba28f19754f62b5227650143d5441fc86d4c7d7 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Wed, 25 Apr 2018 21:33:33 +0200 Subject: Revert "Update NSS to 3.35-RTM" This reverts commit f1a0f0a56fdd0fc39f255174ce08c06b91c66c94. --- .../taskcluster/docker-gcc-4.4/Dockerfile | 30 ---------------------- .../taskcluster/docker-gcc-4.4/bin/checkout.sh | 20 --------------- .../automation/taskcluster/docker-gcc-4.4/setup.sh | 30 ---------------------- 3 files changed, 80 deletions(-) delete mode 100644 security/nss/automation/taskcluster/docker-gcc-4.4/Dockerfile delete mode 100644 security/nss/automation/taskcluster/docker-gcc-4.4/bin/checkout.sh delete mode 100644 security/nss/automation/taskcluster/docker-gcc-4.4/setup.sh (limited to 'security/nss/automation/taskcluster/docker-gcc-4.4') diff --git a/security/nss/automation/taskcluster/docker-gcc-4.4/Dockerfile b/security/nss/automation/taskcluster/docker-gcc-4.4/Dockerfile deleted file mode 100644 index 3330c007f..000000000 --- a/security/nss/automation/taskcluster/docker-gcc-4.4/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -FROM ubuntu:14.04 -MAINTAINER Tim Taubert - -RUN useradd -d /home/worker -s /bin/bash -m worker -WORKDIR /home/worker - -# Add build and test scripts. -ADD bin /home/worker/bin -RUN chmod +x /home/worker/bin/* - -# Install dependencies. -ADD setup.sh /tmp/setup.sh -RUN bash /tmp/setup.sh - -# Change user. -USER worker - -# Env variables. -ENV HOME /home/worker -ENV SHELL /bin/bash -ENV USER worker -ENV LOGNAME worker -ENV HOSTNAME taskcluster-worker -ENV LANG en_US.UTF-8 -ENV LC_ALL en_US.UTF-8 -ENV HOST localhost -ENV DOMSUF localdomain - -# Set a default command for debugging. -CMD ["/bin/bash", "--login"] diff --git a/security/nss/automation/taskcluster/docker-gcc-4.4/bin/checkout.sh b/security/nss/automation/taskcluster/docker-gcc-4.4/bin/checkout.sh deleted file mode 100644 index 9167f6bda..000000000 --- a/security/nss/automation/taskcluster/docker-gcc-4.4/bin/checkout.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -set -v -e -x - -if [ $(id -u) = 0 ]; then - # Drop privileges by re-running this script. - exec su worker $0 -fi - -# 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/security/nss/automation/taskcluster/docker-gcc-4.4/setup.sh b/security/nss/automation/taskcluster/docker-gcc-4.4/setup.sh deleted file mode 100644 index f6325d966..000000000 --- a/security/nss/automation/taskcluster/docker-gcc-4.4/setup.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env bash - -set -v -e -x - -# Update packages. -export DEBIAN_FRONTEND=noninteractive -apt-get -y update && apt-get -y upgrade - -apt_packages=() -apt_packages+=('ca-certificates') -apt_packages+=('g++-4.4') -apt_packages+=('gcc-4.4') -apt_packages+=('locales') -apt_packages+=('make') -apt_packages+=('mercurial') -apt_packages+=('zlib1g-dev') - -# Install packages. -apt-get -y update -apt-get install -y --no-install-recommends ${apt_packages[@]} - -locale-gen en_US.UTF-8 -dpkg-reconfigure locales - -# Cleanup. -rm -rf ~/.ccache ~/.cache -apt-get autoremove -y -apt-get clean -apt-get autoclean -rm $0 -- cgit v1.2.3