From: Petr Štetiar <ynezz@true.cz>
Date: Sun, 13 Sep 2020 08:48:23 +0000 (+0200)
Subject: ci: add testing of collect.py scan method
X-Git-Tag: v3.0.0~12
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=8d83d3d2c6953c27e11ca26e7b488842c966fc89;p=web%2Ffirmware-selector-openwrt-org.git

ci: add testing of collect.py scan method

Signed-off-by: Petr Štetiar <ynezz@true.cz>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6a06c06..ab97a9d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,28 +47,45 @@ build site on Python 3.8:
   variables:
     CI_PYTHON_VERSION: "3.8"
 
-build site for target environment:
+.build site:
   stage: pre-build
   image: debian:9
   before_script:
     - apt-get update; apt-get install -y make python3 ca-certificates
-  script:
-    - cp -R ./www ./build
-    - misc/collect.py scrape https://downloads.openwrt.org build
   artifacts:
     expire_in: 1 week
     when: always
     paths:
       - build
 
-test site with selenium:
+build site for target environment using scrape method:
+  extends: .build site
+  script:
+    - cp -R ./www ./build
+    - misc/collect.py scrape https://downloads.openwrt.org build
+
+build site for target environment using scan method:
+  extends: .build site
+  script:
+    - cp -R ./www ./build
+    - misc/collect.py scan downloads.openwrt.org tests/profiles build
+
+.test site:
   stage: test
   image: selenium/standalone-firefox:latest
-  dependencies:
-    - build site for target environment
   script:
     - /opt/bin/entry_point.sh &
     - sudo apt-get update; sudo apt-get install -y python3-pip python3-pytest
     - pip3 install selenium-firefox
     - (cd build; python3 -m http.server &)
     - pytest-3 tests
+
+test scraped site with selenium:
+  extends: .test site
+  dependencies:
+    - build site for target environment using scrape method
+
+test scaned site with selenium:
+  extends: .test site
+  dependencies:
+    - build site for target environment using scan method