kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-14 11:00:10 +01:00
Code Activity

Merge branch 'buildserver-auto-install' into 'master'

Browse Source 
buildserver auto install

Closes #247

See merge request !229
This commit is contained in:
Michael Pöhn 2017-03-17 12:51:15 +00:00
commit 1bc0ec27c0
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
buildserver/provision-android-sdk
View File

@ -34,6 +34,8 @@ disabled="
@disabled@https\://dl.google.com/android/repository/sys-img/google_apis/sys-img.xml=disabled @disabled@https\://dl.google.com/android/repository/sys-img/google_apis/sys-img.xml=disabled
" "
test -d ${HOME}/.android || mkdir ${HOME}/.android test -d ${HOME}/.android || mkdir ${HOME}/.android
# there are currently zero user repos
echo 'count=0' > ${HOME}/.android/repositories.cfg
for line in $disabled; do for line in $disabled; do
echo $line >> ${HOME}/.android/sites-settings.cfg echo $line >> ${HOME}/.android/sites-settings.cfg
done done
@ -85,3 +87,8 @@ find $ANDROID_HOME/ -type f -executable -print0 | xargs -0 chmod a+x
# allow gradle to install newer build-tools versions # allow gradle to install newer build-tools versions
chgrp vagrant $ANDROID_HOME/build-tools chgrp vagrant $ANDROID_HOME/build-tools
chmod g+w $ANDROID_HOME/build-tools chmod g+w $ANDROID_HOME/build-tools
# allow gradle/sdkmanager to install into the new m2repository
test -d $ANDROID_HOME/extras/m2repository || mkdir -p $ANDROID_HOME/extras/m2repository
find $ANDROID_HOME/extras/m2repository -type d | xargs chgrp vagrant
find $ANDROID_HOME/extras/m2repository -type d | xargs chmod g+w

9
buildserver/provision-apt-get-install
View File

@ -6,14 +6,19 @@ set -x
debian_mirror=$1 debian_mirror=$1
sed -i "s,http://ftp.uk.debian.org/debian/,${debian_mirror},g" /etc/apt/sources.list
printf 'APT::Install-Recommends "0";\nAPT::Install-Suggests "0";\n' \ printf 'APT::Install-Recommends "0";\nAPT::Install-Suggests "0";\n' \
> /etc/apt/apt.conf.d/99no-install-recommends > /etc/apt/apt.conf.d/99no-install-recommends
printf 'APT::Acquire::Retries "20";\n' \ printf 'APT::Acquire::Retries "20";\n' \
> /etc/apt/apt.conf.d/99acquire-retries > /etc/apt/apt.conf.d/99acquire-retries
if echo $debian_mirror | grep '^https' 2>&1 > /dev/null; then
apt-get -y update
apt-get -y install apt-transport-https
fi
sed -i "s,http://ftp.uk.debian.org/debian/,${debian_mirror},g" /etc/apt/sources.list
if grep --quiet jessie /etc/apt/sources.list; then if grep --quiet jessie /etc/apt/sources.list; then
echo "deb $debian_mirror jessie-backports main" > /etc/apt/sources.list.d/backports.list echo "deb $debian_mirror jessie-backports main" > /etc/apt/sources.list.d/backports.list
echo "deb $debian_mirror testing main" > /etc/apt/sources.list.d/testing.list echo "deb $debian_mirror testing main" > /etc/apt/sources.list.d/testing.list

2
jenkins-build-makebuildserver
View File

@ -46,7 +46,7 @@ export VAGRANT_HOME=$WORKSPACE/vagrant.d
mkdir $VAGRANT_HOME mkdir $VAGRANT_HOME
cd $WORKSPACE cd $WORKSPACE
echo "debian_mirror = 'http://ftp.uk.debian.org/debian/'" > $WORKSPACE/makebuildserver.config.py echo "debian_mirror = 'https://deb.debian.org/debian/'" > $WORKSPACE/makebuildserver.config.py
echo "boot_timeout = 1200" >> $WORKSPACE/makebuildserver.config.py echo "boot_timeout = 1200" >> $WORKSPACE/makebuildserver.config.py
echo "apt_package_cache = True" >> $WORKSPACE/makebuildserver.config.py echo "apt_package_cache = True" >> $WORKSPACE/makebuildserver.config.py
./makebuildserver --verbose --clean ./makebuildserver --verbose --clean