This is an automated email from the ASF dual-hosted git repository. potiuk pushed a commit to branch v1-10-test in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 86cc96ce6e0dc99443fe0e9a2377019874a6d5b1 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) (cherry picked from commit 64929eeb70dcb5aa39ce3d504603721c20518cd4) --- BREEZE.rst | 11 ++++++----- breeze | 1 - breeze-complete | 2 +- scripts/ci/pre_commit/pre_commit_check_integrations.sh | 4 +++- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/BREEZE.rst b/BREEZE.rst index 435b21e..c377ec0 100644 --- a/BREEZE.rst +++ b/BREEZE.rst @@ -413,8 +413,10 @@ way as when you enter the environment. You can do it multiple times and open as CLIs for cloud providers ------------------------ -Restarting Breeze environment ------------------------------ +For development convenience we installed simple wrappers for the most common cloud providers CLIs. Those +CLIs are not installed when you build or pull the image - they will be downloaded as docker images +the first time you attempt to use them. It is downloaded and executed in your host's docker engine so once +it is downloaded, it will stay until you remove the downloaded images from your host container. For each of those CLI credentials are taken (automatically) from the credentials you have defined in your ${HOME} directory on host. @@ -697,7 +699,7 @@ Generating requirements Whenever you modify and commit setup.py, you need to re-generate requirement files. Those requirement files ara stored separately for each python version in the ``requirements`` folder. Those are constraints rather than requirements as described in detail in the -`CONTRIBUTING <CONTRIBUTING.rst#pinned-requirement-files>`_ documentation. +`CONTRIBUTING <CONTRIBUTING.rst#pinned-requirement-files>`_ contributing documentation. In case you modify setup.py you need to update the requirements - for every python version supported. @@ -1736,11 +1738,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 rabbitmq redis + cassandra kerberos mongo openldap rabbitmq redis all **************************************************************************************************** Kind kubernetes and Kubernetes tests configuration(optional) diff --git a/breeze b/breeze index abb95b7..571d383 100755 --- a/breeze +++ b/breeze @@ -1411,7 +1411,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 c1d955c..73368b8 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 rabbitmq redis" +_BREEZE_ALLOWED_INTEGRATIONS="cassandra kerberos mongo openldap 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
