Remove license from test configs and update data path.

Signed-off-by: Gregory Schofield <greg.c.schofield@gmail.com>

Author: gscho

scripts/_functions.sh

@@ -4,7 +4,7 @@ function start_server() {
     local BUILD_TYPE="$1"
     if [[ "$BUILD_TYPE" == "docker" ]]; then
         docker load -i gemfast*.tar
-        docker run -d --name gemfast-server -p 2020:2020 -v /etc/gemfast:/etc/gemfast -v /var/gemfast:/var/gemfast goreleaser.ko.local/server:latest start
+        docker run -d --name gemfast-server -p 2020:2020 -v /etc/gemfast:/etc/gemfast -v ./data:/var/lib/gemfast/data goreleaser.ko.local/server:latest start
         sleep 5
         docker ps
         docker logs gemfast-server

scripts/run_auth_tests.sh

@@ -14,7 +14,6 @@ sudo mkdir -p /var/gemfast
 sudo chown -R $USER: /etc/gemfast
 sudo chown -R $USER: /var/gemfast
 cat << CONFIG > /etc/gemfast/gemfast.hcl
-license_key = "B7D865-DA12D3-11DA3D-DD81AE-9420D3-V3"
 auth "local"  {
   allow_anonymous_read = false
   admin_password = "foobar"
@@ -57,7 +56,6 @@ for gem in *.gem; do
 done
 sleep 5
 
-sudo ls -la /var/gemfast/gems
 sudo rm -f Gemfile Gemfile.lock
 cat << CONFIG > Gemfile
 source "https://rubygems.org"

scripts/run_cve_tests.sh

@@ -12,7 +12,6 @@ gem update --system
 sudo mkdir -p /etc/gemfast
 sudo chown -R $USER: /etc/gemfast
 cat << CONFIG > /etc/gemfast/gemfast.hcl
-license_key = "B7D865-DA12D3-11DA3D-DD81AE-9420D3-V3"
 auth "none" {}
 cve {
     enabled = true

scripts/run_filter_tests.sh

@@ -12,7 +12,6 @@ gem update --system
 sudo mkdir -p /etc/gemfast
 sudo chown -R $USER: /etc/gemfast
 cat << CONFIG > /etc/gemfast/gemfast.hcl
-license_key = "B7D865-DA12D3-11DA3D-DD81AE-9420D3-V3"
 auth "none" {}
 filter {
     enabled = true
@@ -38,7 +37,6 @@ popd
 
 sudo rm -rf /etc/gemfast/gemfast.hcl
 sudo tee /etc/gemfast/gemfast.hcl > /dev/null <<'CONFIG'
-license_key = "B7D865-DA12D3-11DA3D-DD81AE-9420D3-V3"
 auth "none" {}
 filter {
     enabled = true

scripts/run_private_gem_tests.sh

@@ -12,7 +12,6 @@ gem update --system
 sudo mkdir -p /etc/gemfast
 sudo chown -R $USER: /etc/gemfast
 cat << CONFIG > /etc/gemfast/gemfast.hcl
-license_key = "B7D865-DA12D3-11DA3D-DD81AE-9420D3-V3"
 auth "none" {}
 private_gems_namespace = "foobar"
 CONFIG
@@ -43,7 +42,6 @@ for gem in *.gem; do
 done
 sleep 5
 
-sudo ls -la /var/gemfast/gems
 sudo rm -f Gemfile Gemfile.lock
 cat << CONFIG > Gemfile
 source "https://rubygems.org"

scripts/run_smoke_tests.sh

@@ -12,26 +12,25 @@ gem update --system
 sudo mkdir -p /etc/gemfast
 sudo chown -R $USER: /etc/gemfast
 cat << CONFIG > /etc/gemfast/gemfast.hcl
-license_key = "B7D865-DA12D3-11DA3D-DD81AE-9420D3-V3"
 auth "none" {}
 CONFIG
 
 start_server "$BUILD_TYPE"
 
-cd ./clones
+pushd ./clones/rails
 
-pushd rails
 bundle config mirror.https://rubygems.org http://localhost:2020
 bundle
+popd
 
 numGems=$(curl -s http://localhost:2020/admin/api/v1/stats/bucket | jq -r '.gems.KeyN')
 curl -s http://localhost:2020/admin/api/v1/backup > gemfast.db
 
-sudo rm -rf /var/gemfast/db/gemfast.db
-sudo mv ./gemfast.db /var/gemfast/db/gemfast.db
+sudo rm -f ./data/db/gemfast.db
+sudo mv ./gemfast.db ./data/db/gemfast.db
 
 if [ "$BUILD_TYPE" != "docker" ]; then
-  sudo chown gemfast: /var/gemfast/db/gemfast.db
+  sudo chown gemfast: ./data/db/gemfast.db
 fi
 
 restart_server "$BUILD_TYPE"

scripts/upload_all.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -euo pipefail
 
-gems_dir="/var/gemfast/gems"
+gems_dir="./data/gems"
 cd $gems_dir
 for gem in *.gem; do
   [ -f "$gem" ] || break