Skip to content

bot: Minor misc optimizations to reduce the Docker image size for the bot #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 3, 2019
Merged

bot: Minor misc optimizations to reduce the Docker image size for the bot #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
67e6f8f
Remove apt lists
marco-c Sep 3, 2019
3e2ddf0
Specify the revision of version-control-tools to use
marco-c Sep 3, 2019
7fb05cf
Remove other unneeded version-control-tools directories
marco-c Sep 3, 2019
7e96df1
Uninstall no longer needed packages after they have been used
marco-c Sep 3, 2019
49755d8
Stop installing lcov, as we are not using it anymore
marco-c Sep 3, 2019
5c46ac6
Install gcc, as it was a dependency of lcov
marco-c Sep 3, 2019
42a3dcc
Merge branch 'master' into smaller_image
La0 Sep 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions bot/ci/bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#!/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
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
Expand All @@ -15,9 +16,11 @@ 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
apt-get purge -y gcc curl python-dev
apt-get autoremove -y
rm -rf /src/version-control-tools/.hg
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
7 changes: 0 additions & 7 deletions bot/tests/test__system.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"