This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/master by this push:
new 64929ee Added "all" to allowed breeze integrations and tried to
clarify on fail (#9872)
64929ee is described below
commit 64929eeb70dcb5aa39ce3d504603721c20518cd4
Author: Alexander Sutcliffe <[email protected]>
AuthorDate: Sat Jul 18 07:38:02 2020 +0200
Added "all" to allowed breeze integrations and tried to clarify on fail
(#9872)
---
BREEZE.rst | 3 +--
breeze | 1 -
breeze-complete | 2 +-
scripts/ci/pre_commit/pre_commit_check_integrations.sh | 4 +++-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/BREEZE.rst b/BREEZE.rst
index cf7fd05..4962bbb 100644
--- a/BREEZE.rst
+++ b/BREEZE.rst
@@ -1849,11 +1849,10 @@ This is the current syntax for `./breeze <./breeze>`_:
-i, --integration <INTEGRATION>
Integration to start during tests - it determines which integrations
are started
for integration tests. There can be more than one integration
started, or all to
- }
start all integrations. Selected integrations are not saved for
future execution.
One of:
- cassandra kerberos mongo openldap presto rabbitmq redis
+ cassandra kerberos mongo openldap presto rabbitmq redis all
****************************************************************************************************
Kind kubernetes and Kubernetes tests configuration(optional)
diff --git a/breeze b/breeze
index 4c05167..4483a06 100755
--- a/breeze
+++ b/breeze
@@ -1530,7 +1530,6 @@ function flag_breeze_actions() {
-i, --integration <INTEGRATION>
Integration to start during tests - it determines which integrations
are started
for integration tests. There can be more than one integration started,
or all to
- }
start all integrations. Selected integrations are not saved for future
execution.
One of:
diff --git a/breeze-complete b/breeze-complete
index 8cc12df..fba3cef 100644
--- a/breeze-complete
+++ b/breeze-complete
@@ -19,7 +19,7 @@
_BREEZE_ALLOWED_PYTHON_MAJOR_MINOR_VERSIONS="2.7 3.5 3.6 3.7 3.8"
_BREEZE_ALLOWED_BACKENDS="sqlite mysql postgres"
-_BREEZE_ALLOWED_INTEGRATIONS="cassandra kerberos mongo openldap presto
rabbitmq redis"
+_BREEZE_ALLOWED_INTEGRATIONS="cassandra kerberos mongo openldap presto
rabbitmq redis all"
_BREEZE_ALLOWED_KUBERNETES_MODES="image git"
_BREEZE_ALLOWED_KUBERNETES_VERSIONS="v1.18.2"
_BREEZE_ALLOWED_HELM_VERSIONS="v3.2.4"
diff --git a/scripts/ci/pre_commit/pre_commit_check_integrations.sh
b/scripts/ci/pre_commit/pre_commit_check_integrations.sh
index 6871941..a0b33c8 100755
--- a/scripts/ci/pre_commit/pre_commit_check_integrations.sh
+++ b/scripts/ci/pre_commit/pre_commit_check_integrations.sh
@@ -26,7 +26,7 @@ cd "${AIRFLOW_SOURCES}" || exit 1
. breeze-complete
-if [[ ${AVAILABLE_INTEGRATIONS} != "${_BREEZE_ALLOWED_INTEGRATIONS}" ]]; then
+if [[ "${AVAILABLE_INTEGRATIONS} all" != "${_BREEZE_ALLOWED_INTEGRATIONS}" ]];
then
echo
echo "Error: Allowed integrations do not match!"
echo
@@ -36,6 +36,8 @@ if [[ ${AVAILABLE_INTEGRATIONS} !=
"${_BREEZE_ALLOWED_INTEGRATIONS}" ]]; then
echo "The ./breeze-complete integrations (_BREEZE_ALLOWED_INTEGRATIONS):"
echo "${_BREEZE_ALLOWED_INTEGRATIONS}"
echo
+ echo "_BREEZE_ALLOWED_INTEGRATIONS should match AVAILABLE_INTEGRATIONS plus
'all'"
+ echo
echo "Please align the two!"
echo
exit 1
