From 67e6f8fb5936cd974dc164de8a14bb197b42903f Mon Sep 17 00:00:00 2001 From: Marco Castelluccio Date: Tue, 3 Sep 2019 13:34:16 +0200 Subject: [PATCH 1/6] Remove apt lists --- bot/ci/bootstrap.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bot/ci/bootstrap.sh b/bot/ci/bootstrap.sh index 87c464b87..bba554257 100755 --- a/bot/ci/bootstrap.sh +++ b/bot/ci/bootstrap.sh @@ -20,4 +20,5 @@ ln -s /src/bot/ci/hgrc $HOME/.hgrc # Cleanup apt-get autoremove -y +rm -rf /var/lib/apt/lists/* rm -rf /src/version-control-tools/.hg From 3e2ddf02380d4b951852e1b8cf8724d646b19e9a Mon Sep 17 00:00:00 2001 From: Marco Castelluccio Date: Tue, 3 Sep 2019 13:36:50 +0200 Subject: [PATCH 2/6] Specify the revision of version-control-tools to use --- bot/ci/bootstrap.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bot/ci/bootstrap.sh b/bot/ci/bootstrap.sh index bba554257..f4d8a4230 100755 --- a/bot/ci/bootstrap.sh +++ b/bot/ci/bootstrap.sh @@ -1,6 +1,7 @@ #!/bin/bash -ex GRCOV_VERSION="v0.5.3" MERCURIAL_VERSION="5.1" +VERSION_CONTROL_TOOLS_REV="709c897f2444" apt-get update apt-get install --no-install-recommends -y curl lcov bzip2 python2-minimal python-bz2file python-dev @@ -15,7 +16,7 @@ curl -L https://github.com/mozilla/grcov/releases/download/$GRCOV_VERSION/grcov- chmod +x /usr/bin/grcov # Setup mercurial with needed extensions -hg clone https://hg.mozilla.org/hgcustom/version-control-tools /src/version-control-tools/ +hg clone -r $VERSION_CONTROL_TOOLS_REV https://hg.mozilla.org/hgcustom/version-control-tools /src/version-control-tools/ ln -s /src/bot/ci/hgrc $HOME/.hgrc # Cleanup From 7fb05cf593e86593d45f59698991342444306517 Mon Sep 17 00:00:00 2001 From: Marco Castelluccio Date: Tue, 3 Sep 2019 13:38:04 +0200 Subject: [PATCH 3/6] Remove other unneeded version-control-tools directories --- bot/ci/bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot/ci/bootstrap.sh b/bot/ci/bootstrap.sh index f4d8a4230..98b28ed1b 100755 --- a/bot/ci/bootstrap.sh +++ b/bot/ci/bootstrap.sh @@ -22,4 +22,4 @@ ln -s /src/bot/ci/hgrc $HOME/.hgrc # Cleanup apt-get autoremove -y rm -rf /var/lib/apt/lists/* -rm -rf /src/version-control-tools/.hg +rm -rf /src/version-control-tools/.hg /src/version-control-tools/ansible /src/version-control-tools/docs /src/version-control-tools/testing From 7e96df1cad5abb997b7d3aa77104fd7836bbb775 Mon Sep 17 00:00:00 2001 From: Marco Castelluccio Date: Tue, 3 Sep 2019 13:41:04 +0200 Subject: [PATCH 4/6] Uninstall no longer needed packages after they have been used --- bot/ci/bootstrap.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bot/ci/bootstrap.sh b/bot/ci/bootstrap.sh index 98b28ed1b..dcc811dd2 100755 --- a/bot/ci/bootstrap.sh +++ b/bot/ci/bootstrap.sh @@ -20,6 +20,7 @@ hg clone -r $VERSION_CONTROL_TOOLS_REV https://hg.mozilla.org/hgcustom/version-c ln -s /src/bot/ci/hgrc $HOME/.hgrc # Cleanup +apt-get purge -y curl python-dev apt-get autoremove -y rm -rf /var/lib/apt/lists/* rm -rf /src/version-control-tools/.hg /src/version-control-tools/ansible /src/version-control-tools/docs /src/version-control-tools/testing From 49755d86a3b4a967c2886cc974803c8b74f4daf4 Mon Sep 17 00:00:00 2001 From: Marco Castelluccio Date: Tue, 3 Sep 2019 13:51:37 +0200 Subject: [PATCH 5/6] Stop installing lcov, as we are not using it anymore --- bot/ci/bootstrap.sh | 2 +- bot/tests/test__system.py | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/bot/ci/bootstrap.sh b/bot/ci/bootstrap.sh index dcc811dd2..de3f2b0a3 100755 --- a/bot/ci/bootstrap.sh +++ b/bot/ci/bootstrap.sh @@ -4,7 +4,7 @@ MERCURIAL_VERSION="5.1" VERSION_CONTROL_TOOLS_REV="709c897f2444" apt-get update -apt-get install --no-install-recommends -y curl lcov bzip2 python2-minimal python-bz2file python-dev +apt-get install --no-install-recommends -y curl bzip2 python2-minimal python-bz2file python-dev # Setup mercurial from its own website, without install pip2 which has a lot of dependencies curl -L https://www.mercurial-scm.org/release/mercurial-$MERCURIAL_VERSION.tar.gz | tar -C /opt -xvz diff --git a/bot/tests/test__system.py b/bot/tests/test__system.py index e991b0b05..1c1d62681 100644 --- a/bot/tests/test__system.py +++ b/bot/tests/test__system.py @@ -28,10 +28,3 @@ def test_grcov(): Test grcov is available on the system """ assert shutil.which("grcov"), "Missing grcov" - - -def test_genhtml(): - """ - Test genhtml is available on the system - """ - assert shutil.which("genhtml"), "Missing genhtml" From 5c46ac653afd2858ef34992012ca1f0ea2e41043 Mon Sep 17 00:00:00 2001 From: Marco Castelluccio Date: Tue, 3 Sep 2019 13:56:22 +0200 Subject: [PATCH 6/6] Install gcc, as it was a dependency of lcov --- bot/ci/bootstrap.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bot/ci/bootstrap.sh b/bot/ci/bootstrap.sh index de3f2b0a3..71eec6284 100755 --- a/bot/ci/bootstrap.sh +++ b/bot/ci/bootstrap.sh @@ -4,7 +4,7 @@ MERCURIAL_VERSION="5.1" VERSION_CONTROL_TOOLS_REV="709c897f2444" apt-get update -apt-get install --no-install-recommends -y curl bzip2 python2-minimal python-bz2file python-dev +apt-get install --no-install-recommends -y gcc curl bzip2 python2-minimal python-bz2file python-dev # Setup mercurial from its own website, without install pip2 which has a lot of dependencies curl -L https://www.mercurial-scm.org/release/mercurial-$MERCURIAL_VERSION.tar.gz | tar -C /opt -xvz @@ -20,7 +20,7 @@ hg clone -r $VERSION_CONTROL_TOOLS_REV https://hg.mozilla.org/hgcustom/version-c ln -s /src/bot/ci/hgrc $HOME/.hgrc # Cleanup -apt-get purge -y curl python-dev +apt-get purge -y gcc curl python-dev apt-get autoremove -y rm -rf /var/lib/apt/lists/* rm -rf /src/version-control-tools/.hg /src/version-control-tools/ansible /src/version-control-tools/docs /src/version-control-tools/testing