Merge pull request #248 from csaf-poc/itest-download-from-agg

Improve integration test scripts

docs/scripts/setupProviderForITest.sh

@@ -113,6 +113,8 @@ popd
 set +e
 
 # Wait for the service to be started
+echo
+echo === Try to reach the validator service ten times, up to nine fails are ok
 for ((i = 1; i <= 10; i++)); do
  if [ $(curl -IL http://localhost:3000/api/v1/tests | grep -c HTTP ) != "0" ]; then
  break

docs/scripts/testAggregator.sh

@@ -15,5 +15,20 @@ sudo mkdir /var/csaf_aggregator
 sudo chgrp www-data /var/csaf_aggregator
 sudo chmod g+ws /var/csaf_aggregator
 
+echo
+echo '=== setup nginx to serve aggregator directory on 9443'
+
+pushd /etc/nginx/sites-enabled
+sudo cp default default2
+sudo sed -i -e 's/8443/9443/' -e 's/\(listen []:[]*443\)/#\1/' \
+    -e 's|root /var/www/html;|root /var/csaf_aggregator/html;|' \
+    default2
+sudo systemctl reload nginx
+popd
+
+echo
+echo '=== run aggregator'
+
 cd ~/csaf_distribution/
-sudo ./bin-linux-amd64/csaf_aggregator -c docs/examples/aggregator.toml
+sudo cp docs/examples/aggregator.toml /etc/csaf
+sudo ./bin-linux-amd64/csaf_aggregator -c /etc/csaf/aggregator.toml

docs/scripts/testDownloader.sh

@@ -10,16 +10,32 @@
 
 set -e  # to exit if a command in the script fails
 
-echo
-echo '==== run downloader'
 cd ~/csaf_distribution
 
+echo
+echo '==== run downloader (1)'
+
 mkdir ~/downloaded1
 
 ./bin-linux-amd64/csaf_downloader --directory ../downloaded1 \
   --rate 4.1 --verbose --insecure localhost
 
 echo
-echo '==== this was downloaded'
-cd ~/downloaded1
+echo '==== this was downloaded (1)'
+pushd ~/downloaded1
 find .
+popd
+
+echo
+echo '==== run downloader (2)'
+
+mkdir ~/downloaded2
+
+./bin-linux-amd64/csaf_downloader --directory ../downloaded2 \
+  --verbose --insecure https://localhost:9443/.well-known/csaf-aggregator/local-dev-provider2/provider-metadata.json
+
+echo
+echo '==== this was downloaded (2)'
+pushd ~/downloaded2
+find .
+popd