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 d752575 Revert "Revert "Adds --install-wheels flag to breeze command
line (#11317)" (#11348)" (#11356)
d752575 is described below
commit d752575e78cceea2c9f194fe82e5d3270ebd72c0
Author: Jarek Potiuk <[email protected]>
AuthorDate: Sat Oct 10 00:41:11 2020 +0200
Revert "Revert "Adds --install-wheels flag to breeze command line (#11317)"
(#11348)" (#11356)
This reverts commit f67e6cb805ebb88db1ca2c995de690dc21138b6b.
---
BREEZE.rst | 10 ++++++++++
breeze | 16 +++++++++++++++-
breeze-complete | 2 +-
scripts/ci/docker-compose/base.yml | 1 +
scripts/ci/libraries/_initialization.sh | 5 +++++
scripts/in_container/entrypoint_ci.sh | 3 +++
6 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/BREEZE.rst b/BREEZE.rst
index 0d7aa6a..726c5d2 100644
--- a/BREEZE.rst
+++ b/BREEZE.rst
@@ -1206,6 +1206,11 @@ This is the current syntax for `./breeze <./breeze>`_:
--no-rbac-ui
Disables RBAC UI when Airflow 1.10.* is installed.
+ --install-wheels
+ If specified it will look for wheel packages placed in dist folder
and it will install the
+ wheels from there after installing Airflow. This is useful for
testing backport
+ packages as well as in the future for testing provider packages for
2.0.
+
-I, --production-image
Use production image for entering the environment and builds (not
for tests).
@@ -2150,6 +2155,11 @@ This is the current syntax for `./breeze <./breeze>`_:
--no-rbac-ui
Disables RBAC UI when Airflow 1.10.* is installed.
+ --install-wheels
+ If specified it will look for wheel packages placed in dist folder
and it will install the
+ wheels from there after installing Airflow. This is useful for
testing backport
+ packages as well as in the future for testing provider packages for
2.0.
+
****************************************************************************************************
Credentials
diff --git a/breeze b/breeze
index 836e592..a4c33f4 100755
--- a/breeze
+++ b/breeze
@@ -117,7 +117,7 @@ function breeze::setup_default_breeze_constants() {
# If set to true, the database will be initialized, a user created and
webserver and scheduler started
export START_AIRFLOW="false"
- # If set to true, the test connections will be create
+ # If set to true, the test connections will be created
export LOAD_DEFAULT_CONNECTIONS="false"
# If set to true, the sample dags will be used
@@ -134,6 +134,10 @@ function breeze::setup_default_breeze_constants() {
# of Airflow is removed and the specified version of Airflow is installed
from GitHub
export INSTALL_AIRFLOW_REFERENCE=""
+ # if set to true, the ci image will look for wheel packages in dist folder
and will install them
+ # during entering the container
+ export INSTALL_WHEELS="false"
+
# Determines whether to force build without checking if it is needed
# Can be overridden by '--force-build-images' flag.
export FORCE_BUILD_IMAGES="false"
@@ -1108,6 +1112,12 @@ function breeze::parse_arguments() {
echo
shift
;;
+ --install-wheels)
+ export INSTALL_WHEELS="true"
+ echo "Install wheels found in dist folder"
+ echo
+ shift
+ ;;
--)
shift
break
@@ -2169,6 +2179,10 @@ ${FORMATTED_INSTALL_AIRFLOW_VERSIONS}
--no-rbac-ui
Disables RBAC UI when Airflow 1.10.* is installed.
+--install-wheels
+ If specified it will look for wheel packages placed in dist folder and
it will install the
+ wheels from there after installing Airflow. This is useful for testing
backport
+ packages as well as in the future for testing provider packages for
2.0.
"
}
diff --git a/breeze-complete b/breeze-complete
index 18c63a7..e4794cb 100644
--- a/breeze-complete
+++ b/breeze-complete
@@ -155,7 +155,7 @@ additional-extras: additional-python-deps:
dev-apt-deps: additional-dev-apt-deps: dev-apt-command:
additional-dev-apt-command: additional-dev-apt-env:
runtime-apt-deps: additional-runtime-apt-deps: runtime-apt-command:
additional-runtime-apt-command: additional-runtime-apt-env:
load-default-connections load-example-dags
-no-rbac-ui
+install-wheels no-rbac-ui
"
_breeze_commands="
diff --git a/scripts/ci/docker-compose/base.yml
b/scripts/ci/docker-compose/base.yml
index a0e7728..f89aefd 100644
--- a/scripts/ci/docker-compose/base.yml
+++ b/scripts/ci/docker-compose/base.yml
@@ -52,6 +52,7 @@ services:
- START_AIRFLOW
- LOAD_EXAMPLES
- LOAD_DEFAULT_CONNECTIONS
+ - INSTALL_WHEELS
- DISABLE_RBAC
- ENABLED_SYSTEMS
- RUN_SYSTEM_TESTS
diff --git a/scripts/ci/libraries/_initialization.sh
b/scripts/ci/libraries/_initialization.sh
index 003238b..f9711d9 100644
--- a/scripts/ci/libraries/_initialization.sh
+++ b/scripts/ci/libraries/_initialization.sh
@@ -126,6 +126,10 @@ function initialization::initialize_base_variables() {
# If set to true, RBAC UI will not be used for 1.10 version
export DISABLE_RBAC=${DISABLE_RBAC:="false"}
+ # if set to true, the ci image will look for wheel packages in dist folder
and will install them
+ # during entering the container
+ export INSTALL_WHEELS=${INSTALL_WHEELS:="false"}
+
# If set the specified file will be used to initialized Airflow after the
environment is created,
# otherwise it will use files/airflow-breeze-config/init.sh
export INIT_SCRIPT_FILE=${INIT_SCRIPT_FILE:=""}
@@ -549,6 +553,7 @@ Initialization variables:
INIT_SCRIPT_FILE: ${INIT_SCRIPT_FILE}
LOAD_DEFAULT_CONNECTIONS: ${LOAD_DEFAULT_CONNECTIONS}
LOAD_EXAMPLES: ${LOAD_EXAMPLES}
+ INSTALL_WHEELS: ${INSTALL_WHEELS}
DISABLE_RBAC: ${DISABLE_RBAC}
EOF
diff --git a/scripts/in_container/entrypoint_ci.sh
b/scripts/in_container/entrypoint_ci.sh
index 63e0803..61562d5 100755
--- a/scripts/in_container/entrypoint_ci.sh
+++ b/scripts/in_container/entrypoint_ci.sh
@@ -97,6 +97,9 @@ else
install_released_airflow_version "${INSTALL_AIRFLOW_VERSION}"
fi
+if [[ ${INSTALL_WHEELS} == "true" ]]; then
+ pip install /dist/*.whl || true
+fi
export RUN_AIRFLOW_1_10=${RUN_AIRFLOW_1_10:="false"}
