diff options
| -rwxr-xr-x | csit/run-k8s-csit.sh | 6 | ||||
| -rwxr-xr-x | csit/start-s3p-tests.sh | 4 | ||||
| -rwxr-xr-x | helm/policy/values.yaml | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/csit/run-k8s-csit.sh b/csit/run-k8s-csit.sh index d383d1a1..248a494f 100755 --- a/csit/run-k8s-csit.sh +++ b/csit/run-k8s-csit.sh @@ -21,10 +21,8 @@ # This script spins up kubernetes cluster in Microk8s for deploying policy helm charts. # Runs CSITs in kubernetes. -if [ -z "${WORKSPACE}" ]; then - WORKSPACE=$(git rev-parse --show-toplevel) - export WORKSPACE -fi +WORKSPACE=$(git rev-parse --show-toplevel) +export WORKSPACE export GERRIT_BRANCH=$(awk -F= '$1 == "defaultbranch" { print $2 }' "${WORKSPACE}"/.gitreview) diff --git a/csit/start-s3p-tests.sh b/csit/start-s3p-tests.sh index 8fb571f4..1609e4bb 100755 --- a/csit/start-s3p-tests.sh +++ b/csit/start-s3p-tests.sh @@ -22,8 +22,8 @@ # Start Kubernetes function start_kubernetes() { - bash run-k8s-csit.sh install $3 - bash get-cluster-info.sh + bash run-k8s-csit.sh install + bash resources/scripts/get-cluster-info.sh } function install_jmeter() { diff --git a/helm/policy/values.yaml b/helm/policy/values.yaml index 5ee91496..f4d72125 100755 --- a/helm/policy/values.yaml +++ b/helm/policy/values.yaml @@ -89,7 +89,7 @@ mariadb: image: mariadb:10.5.8 dbmigrator: - image: onap/policy-db-migrator:2.6-SNAPSHOT-latest + image: onap/policy-db-migrator:3.0.1-SNAPSHOT schema: policyadmin policy_home: "/opt/app/policy" |