diff options
| author |   Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com> | 2020-10-22 17:26:58 +0300 |
|---|---|---|
| committer | Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com> | 2020-10-26 11:29:22 +0200 |
| commit | f02c14dcebf64ace76a35002c371044cd327ef34 (patch) | |
| tree | 07bff8d9f6b7e2961c8ca5afd17ca5319ce0fd56 /scripts | |
| parent | e50b1f4517d353e31626d06fa3a5bea079a07c44 (diff) | |
Fix CCSDK healthcheck CSIT
- update tested images to version 1.1-STAGING-latest
- fix and improve readiness checks
- reduce timeouts significantly
- fail setup (and the whole test suite) if readiness check never succeeds
- move health_check.sh to proper place under csit/scripts dir
and remove unnecessary script1.sh
Issue-ID: CCSDK-2850, CCSDK-2851
Signed-off-by: Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>
Change-Id: Ia76b6e98b47888faf043897eb0f3af0ef7ba5800
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/ccsdk/healthcheck/health_check.sh | 30 | ||||
| -rw-r--r-- | scripts/ccsdk/script1.sh | 20 |
2 files changed, 30 insertions, 20 deletions
diff --git a/scripts/ccsdk/healthcheck/health_check.sh b/scripts/ccsdk/healthcheck/health_check.sh new file mode 100644 index 00000000..aed3b5ab --- /dev/null +++ b/scripts/ccsdk/healthcheck/health_check.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env bash +############################################################################### +# Copyright 2017 Huawei Technologies Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Modifications copyright (c) 2020 Samsung Electronics Co., Ltd. +# +############################################################################### +unset http_proxy https_proxy + +response=$(curl --write-out '%{http_code}' --silent --output /dev/null -H "Authorization: Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==" -X POST -H "X-FromAppId: csit-sdnc" -H "X-TransactionId: csit-ccsdk" -H "Accept: application/json" -H "Content-Type: application/json" http://localhost:8383/restconf/operations/SLI-API:healthcheck ) + +if [ "$response" == "200" ]; then + echo "CCSDK health check passed." + exit 0; +fi + +echo "CCSDK health check failed with response code ${response}." +exit 1 diff --git a/scripts/ccsdk/script1.sh b/scripts/ccsdk/script1.sh deleted file mode 100644 index 223479e2..00000000 --- a/scripts/ccsdk/script1.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# -# Copyright 2016-2017 Huawei Technologies Co., Ltd. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# Modifications copyright (c) 2017 AT&T Intellectual Property -# - -echo "This is ${WORKSPACE}/scripts/ccsdk/script1.sh" |