fix e2e tests (#111)

Author: jesusfcr

.travis.yml

@@ -1,3 +1,4 @@
+dist: focal
 language: go
 go:
   - 1.21.x

_script/run-e2e.sh

@@ -16,7 +16,6 @@ case $# in
 	;;
 esac
 
-COMPOSE_OPTIONS=""
 case $ARG in
 "read")
 	CONFIG_FILE="_resources/config/e2e-read-replica.toml"
@@ -34,17 +33,15 @@ case $ARG in
 	;;
 esac
 
-
 # Start postgress databases.
-docker-compose -f _resources/docker-compose-e2e.yml  -p "e2e" up -d $SERVICE
+docker-compose -f _resources/docker-compose-e2e.yml -p e2e up --quiet-pull -d $SERVICE
 
 # Set up schema for the test db.
-set +e
-rm -rf /tmp/vulnerability-db
-set -e
-git clone --single-branch --branch master https://github.com/adevinta/vulnerability-db.git /tmp/vulnerability-db
-docker run --net=host -v /tmp/vulnerability-db/db:/flyway/sql flyway/flyway:"${FLYWAY_VERSION:-8}-alpine" \
+VDB=$(mktemp -d)
+git clone --single-branch --branch master https://github.com/adevinta/vulnerability-db.git "$VDB"
+docker run --net=host -v "$VDB/db/sql":/flyway/sql flyway/flyway:"${FLYWAY_VERSION:-10}-alpine" \
     -user=vulndb -password=vulndb -url=jdbc:postgresql://127.0.0.1:5434/vulndbtest -baselineOnMigrate=true migrate
+rm -rf "$VDB"
 
 # Loaf fixtures in the test db.
 TestDBPort=5434 go run e2e/fixtures.go _resources/e2e/fixtures/
@@ -70,4 +67,3 @@ set +e
 pkill vulnerability-db-api
 set -e
 docker-compose -f _resources/docker-compose-e2e.yml  -p "e2e" rm -s -f -v
-

e2e/fixtures.go

@@ -48,7 +48,7 @@ func LoadFixtures(fixturesDir string) error {
 	defer db.Close() // nolint: errcheck
 
 	// Mock current time to ensure consistent exposure calculations.
-	_, err = db.Exec(`CREATE SCHEMA mock;`)
+	_, err = db.Exec(`CREATE SCHEMA IF NOT EXISTS mock;`)
 	if err != nil {
 		return err
 	}