From bcfd6f15f71129a504bab463e84f51e3b3840644 Mon Sep 17 00:00:00 2001
From: mo khan <mo.khan@gmail.com>
Date: Wed, 4 Mar 2020 12:12:48 -0700
Subject: Convert python qa jobs to integration tests

---
 bin/docker-test | 15 +++++++++++++++
 bin/test        | 13 +------------
 bin/test-all    | 30 ------------------------------
 bin/test-local  | 15 ---------------
 4 files changed, 16 insertions(+), 57 deletions(-)
 create mode 100755 bin/docker-test
 delete mode 100755 bin/test-all
 delete mode 100755 bin/test-local

(limited to 'bin')

diff --git a/bin/docker-test b/bin/docker-test
new file mode 100755
index 0000000..75bfc39
--- /dev/null
+++ b/bin/docker-test
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+PROJECT_PATH="$1"
+
+if [ -z "$LM_HOME" ]; then
+  export IMAGE_NAME=${IMAGE_NAME:-$(basename "$PWD"):latest}
+
+  docker run --rm --env LICENSE_FINDER_CLI_OPTS --volume "$PROJECT_PATH":/code "$IMAGE_NAME" analyze /code
+else
+  /run.sh analyze "$PROJECT_PATH"
+fi
diff --git a/bin/test b/bin/test
index 8c08e55..70f8581 100755
--- a/bin/test
+++ b/bin/test
@@ -4,15 +4,4 @@ set -e
 
 cd "$(dirname "$0")/.."
 
-export LM_PYTHON_VERSION=${LM_PYTHON_VERSION:-2}
-export LM_REPORT_VERSION=${LM_REPORT_VERSION:-1}
-export QA_RESULTS=${QA_RESULTS:-$QA_PROJECT-v$LM_REPORT_VERSION}
-export RESULTS_DIR=${RESULTS_DIR:-$(pwd)/results}
-export QA_REF=${QA_REF:-master}
-
-docker run \
-  --rm \
-  --env LM_PYTHON_VERSION \
-  --env LM_REPORT_VERSION \
-  --volume "$RESULTS_DIR":/results \
-  "$IMAGE_NAME" test "$QA_PROJECT" "$QA_RESULTS" "$QA_REF"
+bundle exec rspec
diff --git a/bin/test-all b/bin/test-all
deleted file mode 100755
index be92121..0000000
--- a/bin/test-all
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-set -e
-
-cd "$(dirname "$0")/.."
-
-RESULTS_DIR=$(pwd)/tmp
-export RESULTS_DIR
-IMAGE_NAME=$(basename "$PWD"):latest
-export IMAGE_NAME
-
-./bin/docker-build
-
-REPORT_VERSIONS=(2 1.1 1)
-for version in "${REPORT_VERSIONS[@]}"
-do
-  export LM_REPORT_VERSION=$version
-  echo "Report Version $LM_REPORT_VERSION"
-  QA_PROJECT=go-modules ./bin/test
-  QA_PROJECT=php-composer ./bin/test
-  QA_PROJECT=java-maven QA_REF=831c7a04 ./bin/test
-  QA_PROJECT=python-pip QA_REF=04dce91b LM_PYTHON_VERSION=2 ./bin/test
-  QA_PROJECT=python-pip QA_RESULTS="python3-pip-v$version" QA_REF=48e250a1 LM_PYTHON_VERSION=3 ./bin/test
-  QA_PROJECT=ruby-bundler ./bin/test
-  QA_PROJECT=js-yarn ./bin/test
-  QA_PROJECT=js-npm ./bin/test
-  QA_PROJECT=csharp-nuget-dotnetcore ./bin/test
-  QA_PROJECT=python-pipenv QA_REF=pip-file-lock ./bin/test
-  QA_PROJECT=java-gradle ./bin/test
-done
diff --git a/bin/test-local b/bin/test-local
deleted file mode 100755
index 75bfc39..0000000
--- a/bin/test-local
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd "$(dirname "$0")/.."
-
-PROJECT_PATH="$1"
-
-if [ -z "$LM_HOME" ]; then
-  export IMAGE_NAME=${IMAGE_NAME:-$(basename "$PWD"):latest}
-
-  docker run --rm --env LICENSE_FINDER_CLI_OPTS --volume "$PROJECT_PATH":/code "$IMAGE_NAME" analyze /code
-else
-  /run.sh analyze "$PROJECT_PATH"
-fi
-- 
cgit v1.2.3