X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=.gitlab-ci.yml;h=948cf678306d7afde31d1dd77ba0b9d097e1ecbf;hb=02203efe1582c90137209900dc30dbc55843bbaf;hp=1705910f7b88f5f6a6f1aba89627e8166aaaa173;hpb=05eef5a454d50640f8bb88d8f3fb0a72eb75bf8f;p=fdroidserver.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1705910f..948cf678 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@ test:
 metadata_v0:
   image: registry.gitlab.com/fdroid/ci-images-server:latest
   variables:
-    RELEASE_COMMIT_ID: 6d69dcddd95fe08ffe431e305932cfdeafd6fc9d  # 1.0.0
+    RELEASE_COMMIT_ID: 2f563f533b3571c80f7a09c6fbb453398658f723  # 1.0.2
   script:
     - git fetch https://gitlab.com/fdroid/fdroidserver $RELEASE_COMMIT_ID
     - cd tests
@@ -43,39 +43,33 @@ debian_testing:
   only:
     - master@fdroid/fdroidserver
   script:
-    - apt update -y
-    - apt dist-upgrade -y
-    - apt-get install -y --no-install-recommends
-        aapt adb android-platform-tools-base android-sdk-common fdroidserver
-        git gnupg python3-setuptools zipalign
+    - apt-get -qy update
+    - apt-get -qy dist-upgrade
+    - apt-get -qy install --no-install-recommends
+        fdroidserver git gnupg python3-setuptools
+    - sed -i -e 's,testing,sid,g' -e  's,testing,sid,g' /etc/apt/sources.list
+    - apt-get -qy update
+    - apt-get install -y --no-install-recommends aapt androguard android-platform-tools-base zipalign
+    - python3 -c 'import fdroidserver'
+    - python3 -c 'import androguard'
     - export ANDROID_HOME=/usr/lib/android-sdk
     - export LANG=C.UTF-8
     - cd tests
-    - rm -f install.TestCase  # fails frequently and is unimportant
-    - echo "Debian's build-tools is too old, remove once the package has been updated"
-    - sed -i '/android.permission.READ_EXTERNAL_STORAGE/d' repo/index.xml
-    - sed -i '/^diff -uw .*index-v1.json$/d' run-tests
     - ./run-tests
 
+# test using LTS set up with the PPA, including Recommends
 ubuntu_lts:
   image: ubuntu:latest
   only:
     - master@fdroid/fdroidserver
   script:
-    - apt-key adv --keyserver hkp://pool.sks-keyservers.net --recv-key 9AAC253193B65D4DF1D0A13EEC4632C79C5E0151
+    - while ! apt-key adv --keyserver hkp://pool.sks-keyservers.net --recv-key 9AAC253193B65D4DF1D0A13EEC4632C79C5E0151; do sleep 15; done
     - export RELEASE=`sed -n 's,^deb [^ ][^ ]* \([a-z]*\).*,\1,p' /etc/apt/sources.list | head -1`
     - echo "deb http://ppa.launchpad.net/fdroid/fdroidserver/ubuntu $RELEASE main" >> /etc/apt/sources.list
-    - apt update -y
-    - apt dist-upgrade -y
-    - apt-get install -y --no-install-recommends
-        aapt adb android-platform-tools-base android-sdk-common fdroidserver
-        git gnupg python3-setuptools unzip wget zipalign
+    - apt-get -qy update
+    - apt-get -qy dist-upgrade
+    - apt-get -qy install fdroidserver git python3-setuptools
     - export ANDROID_HOME=/usr/lib/android-sdk
-    # xenial's aapt is too old
-    - wget --no-verbose https://dl.google.com/android/repository/build-tools_r27.0.1-linux.zip
-    - unzip -q build-tools_r27.0.1-linux.zip
-    - rm build-tools_r27.0.1-linux.zip
-    - mv android-8.1.0 $ANDROID_HOME/build-tools/27.0.1
     - export LANG=C.UTF-8
     - cd tests
     - ./run-tests