mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-10-08 18:31:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

btlog: test with fdroid update without requiring ssh access

Browse source 
Yay git!  Just use a filesystem git remote instead of ssh.
This commit is contained in:
Hans-Christoph Steiner 2017-04-03 23:16:39 +02:00
parent 4b7084f779
commit 136d58dbae
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
fdroidserver/update.py
View file

@ -1408,8 +1408,9 @@ def main():
if len(repodirs) > 1: if len(repodirs) > 1:
index.make(apps, sortedids, archapks, repodirs[1], True) index.make(apps, sortedids, archapks, repodirs[1], True)
if config.get('binary_transparency_remote'): git_remote = config.get('binary_transparency_remote')
btlog.make_binary_transparency_log(repodirs, git_remote=config['binary_transparency_remote']) if git_remote or os.path.isdir(os.path.join('binary_transparency', '.git')):
btlog.make_binary_transparency_log(repodirs, git_remote=git_remote)
if config['update_stats']: if config['update_stats']:
# Update known apks info... # Update known apks info...

7
tests/run-tests
View file

@ -592,12 +592,15 @@ echo_header "copy tests/repo, update with binary transparency log"
REPOROOT=`create_test_dir` REPOROOT=`create_test_dir`
GNUPGHOME=$REPOROOT/gnupghome GNUPGHOME=$REPOROOT/gnupghome
KEYSTORE=$WORKSPACE/tests/keystore.jks KEYSTORE=$WORKSPACE/tests/keystore.jks
mkdir $REPOROOT/git_remote
cd $REPOROOT/git_remote
git init --bare
cd $REPOROOT cd $REPOROOT
$fdroid init --keystore $KEYSTORE --repo-keyalias=sova $fdroid init --keystore $KEYSTORE --repo-keyalias=sova
cp -a $WORKSPACE/tests/metadata $WORKSPACE/tests/repo $WORKSPACE/tests/stats $REPOROOT/ cp -a $WORKSPACE/tests/metadata $WORKSPACE/tests/repo $WORKSPACE/tests/stats $REPOROOT/
echo 'keystorepass = "r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI="' >> config.py echo 'keystorepass = "r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI="' >> config.py
echo 'keypass = "r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI="' >> config.py echo 'keypass = "r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI="' >> config.py
echo 'binary_transparency_remote = "git@gitlab.com:fdroid-continuous-integration/binary-transparency.git"' >> config.py echo "binary_transparency_remote = '$REPOROOT/git_remote'" >> config.py
echo "accepted_formats = ['json', 'txt', 'yml']" >> config.py echo "accepted_formats = ['json', 'txt', 'yml']" >> config.py
$fdroid update --verbose --pretty $fdroid update --verbose --pretty
test -e repo/index.xml test -e repo/index.xml
@ -606,6 +609,8 @@ test -e repo/index-v1.jar
grep -F '<application id=' repo/index.xml > /dev/null grep -F '<application id=' repo/index.xml > /dev/null
cd binary_transparency cd binary_transparency
[ `git rev-list --count HEAD` == "2" ] [ `git rev-list --count HEAD` == "2" ]
cd $REPOROOT/git_remote
[ `git rev-list --count HEAD` == "2" ]
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#