Fix integration tests being accidentally excluded (#10807)
The change from #10769 accidentally switched Integration tests into far-longer run unit tests (we effectively run the tests twice and did not run integration tests. This fixes the problem by removing readonly status from INTEGRATIONS and only setting it after the integrations are set.
This commit is contained in:
Родитель
3c6fdd84f8
Коммит
c60fcccdb6
|
@ -545,8 +545,6 @@ function initialization::make_constants_read_only() {
|
||||||
readonly HOST_HOME
|
readonly HOST_HOME
|
||||||
readonly HOST_OS
|
readonly HOST_OS
|
||||||
|
|
||||||
readonly INTEGRATIONS
|
|
||||||
|
|
||||||
readonly ENABLE_KIND_CLUSTER
|
readonly ENABLE_KIND_CLUSTER
|
||||||
readonly KUBERNETES_MODE
|
readonly KUBERNETES_MODE
|
||||||
readonly KUBERNETES_VERSION
|
readonly KUBERNETES_VERSION
|
||||||
|
|
|
@ -17,6 +17,9 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
# shellcheck source=scripts/ci/libraries/_script_init.sh
|
# shellcheck source=scripts/ci/libraries/_script_init.sh
|
||||||
|
|
||||||
|
|
||||||
|
. "$( dirname "${BASH_SOURCE[0]}" )/../libraries/_script_init.sh"
|
||||||
|
|
||||||
INTEGRATIONS=()
|
INTEGRATIONS=()
|
||||||
|
|
||||||
ENABLED_INTEGRATIONS=${ENABLED_INTEGRATIONS:=""}
|
ENABLED_INTEGRATIONS=${ENABLED_INTEGRATIONS:=""}
|
||||||
|
@ -39,8 +42,7 @@ do
|
||||||
INTEGRATIONS+=("${SCRIPTS_CI_DIR}/docker-compose/integration-${_INT}.yml")
|
INTEGRATIONS+=("${SCRIPTS_CI_DIR}/docker-compose/integration-${_INT}.yml")
|
||||||
done
|
done
|
||||||
|
|
||||||
|
readonly INTEGRATIONS
|
||||||
. "$( dirname "${BASH_SOURCE[0]}" )/../libraries/_script_init.sh"
|
|
||||||
|
|
||||||
if [[ -f ${BUILD_CACHE_DIR}/.skip_tests ]]; then
|
if [[ -f ${BUILD_CACHE_DIR}/.skip_tests ]]; then
|
||||||
echo
|
echo
|
||||||
|
|
Загрузка…
Ссылка в новой задаче