Skip to content
Snippets Groups Projects
Verified Commit 1e0e59d1 authored by David Hoese's avatar David Hoese
Browse files

Attempt to fix ci tests geo2grid name for grb pvc

parent 3d9d108f
No related branches found
No related tags found
No related merge requests found
...@@ -19,6 +19,8 @@ install_charts() { ...@@ -19,6 +19,8 @@ install_charts() {
popd popd
# Geo2Grid # Geo2Grid
grb_pvc=$(get_pvc_name ${GRB_RELEASE_NAME})
sed -i "s/cspp-geo-grb/${GRB_RELEASE_NAME}/g" "../../ci_tests/values-geo2grid-g16-radm1.yaml"
./helpers/deploy_geo2grid.sh "ci_tests" "${RELEASE_PREFIX}" "-g16-radm1" ./helpers/deploy_geo2grid.sh "ci_tests" "${RELEASE_PREFIX}" "-g16-radm1"
} }
...@@ -27,8 +29,14 @@ get_pod_name() { ...@@ -27,8 +29,14 @@ get_pod_name() {
kubectl -n $ns get pods --selector=app.kubernetes.io/instance=${release_name} -o name kubectl -n $ns get pods --selector=app.kubernetes.io/instance=${release_name} -o name
} }
get_pvc_name() {
release_name="$1"
kubectl -n $ns get pvc --selector=app.kubernetes.io/instance=${release_name} -o name
}
wait_for_pod() { wait_for_pod() {
pod_name="$1" pod_name="$1"
debug "Waiting for ${pod_name} pod to be ready..."
kubectl -n $ns wait --for=condition=Ready ${pod_name} --timeout=120s kubectl -n $ns wait --for=condition=Ready ${pod_name} --timeout=120s
} }
...@@ -82,3 +90,4 @@ wait_for_pod ${GRB_POD_NAME} || error "GRB pod was never ready" ...@@ -82,3 +90,4 @@ wait_for_pod ${GRB_POD_NAME} || error "GRB pod was never ready"
run_grb_checks || error "GRB checks failed" run_grb_checks || error "GRB checks failed"
wait_for_pod ${GEO2GRID_POD_NAME} || error "Geo2Grid pod was never ready" wait_for_pod ${GEO2GRID_POD_NAME} || error "Geo2Grid pod was never ready"
run_geo2grid_checks || error "Geo2Grid checks failed" run_geo2grid_checks || error "Geo2Grid checks failed"
...@@ -24,5 +24,4 @@ ns=$(./helpers/get_namespace.sh) ...@@ -24,5 +24,4 @@ ns=$(./helpers/get_namespace.sh)
cd geosphere-geo2grid/chart cd geosphere-geo2grid/chart
source cspp-geo-geo2grid/cibuild.env source cspp-geo-geo2grid/cibuild.env
echo "Deploying version $docker_tag to cluster namespace $ns" echo "Deploying version $docker_tag to cluster namespace $ns"
# namespace names are the same as domain names
helm upgrade -v 2 --install --namespace $ns -f ../../${values_base}/values-geo2grid${release_suffix}.yaml "${release_prefix}cspp-geo-geo2grid${release_suffix}" cspp-geo-geo2grid/ helm upgrade -v 2 --install --namespace $ns -f ../../${values_base}/values-geo2grid${release_suffix}.yaml "${release_prefix}cspp-geo-geo2grid${release_suffix}" cspp-geo-geo2grid/
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment