common: use python instead of calling out to 'rm'

[fdroidserver.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d0e173d870f6f1f6b91d807544c4ac2ad1eddd5a..0b0a4d3e5e4562170ee85d4d3b5e4fdace523513 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,37 +1,27 @@
-image: registry.gitlab.com/fdroid/ci-images:server-latest
+image: registry.gitlab.com/fdroid/ci-images-server:latest
 
 test:
   script:
-    - apt-get -qq update && apt-get -y dist-upgrade
-    - mkdir -p /usr/lib/python3.4/site-packages/
-    # workaround https://github.com/pypa/setuptools/issues/937
-    - pip3 install setuptools==33.1.1
     - pip3 install -e .
     - cd tests
     - ./complete-ci-tests
 
-# Test that the parsing of the .txt format didn't change. The metadata
-# field 'Author Web Site' was added after 0.7.0, so that can't be part
-# of the test.
+# Test that the parsing of the .txt format didn't change from last
+# released version. Ensure that the official tags are included when
+# running these tests on forks as well.
 metadata_v0:
   script:
+    - git fetch https://gitlab.com/fdroid/fdroidserver 0.8
     - cd tests
-    - cp dump_internal_metadata_format.py dump.py # since this isn't in old commits
     - export GITCOMMIT=`git describe`
-    - git checkout 0.7.0  # or any old commit of your choosing
+    - git checkout 0.8  # bump after release
     - cd ..
-    - sed -i "s/'Author Email',/'Author Email',\n'Author Web Site',/" fdroidserver/metadata.py
     - git clone --depth 1 https://gitlab.com/fdroid/fdroiddata
     - cd fdroiddata
-    - ../tests/dump.py
+    - ../tests/dump_internal_metadata_format.py
     - cd ..
     - git reset --hard
     - git checkout $GITCOMMIT
     - cd fdroiddata
-    - ../tests/dump.py
-    - "sed -i -e '/AuthorWebSite/d'
-             -e '/Description: No description available/d'
-             -e \"/Description: ''/d\"
-             -e '/buildozer:/d'
-             metadata/dump_*/*.yaml"
+    - ../tests/dump_internal_metadata_format.py
     - diff -uw metadata/dump_*