You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by po...@apache.org on 2020/11/29 17:06:18 UTC

[airflow] 14/17: Allows mounting local sources for github run-id images (#12650)

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 9fe91028025cff4c12b6a11592f9683da312ab85
Author: Jarek Potiuk <ja...@polidea.com>
AuthorDate: Fri Nov 27 12:15:03 2020 +0100

    Allows mounting local sources for github run-id images (#12650)
    
    The images that are build on github can be used to reproduce
    the test errors in CI - they should then be mounted without
    local sources. However in some cases when you are dealing with
    dependencies for example, it is useful to be able to mount the
    sources.
    
    This PR makes it possible.
    
    (cherry picked from commit c0843930bf5c587a054586706021a2f5b492ec42)
---
 breeze                               | 1 -
 scripts/in_container/run_ci_tests.sh | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/breeze b/breeze
index 0c09046..fe8f038 100755
--- a/breeze
+++ b/breeze
@@ -1085,7 +1085,6 @@ function breeze::parse_arguments() {
             export GITHUB_REGISTRY_PUSH_IMAGE_TAG="${2}"
             export CHECK_IMAGE_FOR_REBUILD="false"
             export SKIP_BUILDING_PROD_IMAGE="true"
-            export MOUNT_LOCAL_SOURCES="false"
             export SKIP_CHECK_REMOTE_IMAGE="true"
             export FAIL_ON_GITHUB_DOCKER_PULL_ERROR="true"
             shift 2
diff --git a/scripts/in_container/run_ci_tests.sh b/scripts/in_container/run_ci_tests.sh
index 8b66a94..7f2be4c 100755
--- a/scripts/in_container/run_ci_tests.sh
+++ b/scripts/in_container/run_ci_tests.sh
@@ -52,22 +52,22 @@ elif [[ "${RES}" != "0" ]]; then
     >&2 echo "*"
     >&2 echo "*     Run all tests:"
     >&2 echo "*"
-    >&2 echo "*       ./breeze --backend ${BACKEND} ${EXTRA_ARGS}--python ${PYTHON_MAJOR_MINOR_VERSION} --db-reset --test-type ${TEST_TYPE}  tests"
+    >&2 echo "*       ./breeze --backend ${BACKEND} ${EXTRA_ARGS}--python ${PYTHON_MAJOR_MINOR_VERSION} --db-reset --skip-mounting-local-sources --test-type ${TEST_TYPE}  tests"
     >&2 echo "*"
     >&2 echo "*     Enter docker shell:"
     >&2 echo "*"
-    >&2 echo "*       ./breeze --backend ${BACKEND} ${EXTRA_ARGS}--python ${PYTHON_MAJOR_MINOR_VERSION} --db-reset --test-type ${TEST_TYPE}  shell"
+    >&2 echo "*       ./breeze --backend ${BACKEND} ${EXTRA_ARGS}--python ${PYTHON_MAJOR_MINOR_VERSION} --db-reset --skip-mounting-local-sources --test-type ${TEST_TYPE}  shell"
     >&2 echo "*"
     if [[ ${GITHUB_REGISTRY_PULL_IMAGE_TAG=} != "" ]]; then
         >&2 echo "*   When you do not have sources:"
         >&2 echo "*"
         >&2 echo "*     Run all tests:"
         >&2 echo "*"
-        >&2 echo "*      ./breeze --github-image-id ${GITHUB_REGISTRY_PULL_IMAGE_TAG} --backend ${BACKEND} ${EXTRA_ARGS}--python ${PYTHON_MAJOR_MINOR_VERSION} --db-reset --test-type ${TEST_TYPE} tests"
+        >&2 echo "*      ./breeze --github-image-id ${GITHUB_REGISTRY_PULL_IMAGE_TAG} --backend ${BACKEND} ${EXTRA_ARGS}--python ${PYTHON_MAJOR_MINOR_VERSION} --db-reset --skip-mounting-local-sources --test-type ${TEST_TYPE} tests"
         >&2 echo "*"
         >&2 echo "*     Enter docker shell:"
         >&2 echo "*"
-        >&2 echo "*      ./breeze --github-image-id ${GITHUB_REGISTRY_PULL_IMAGE_TAG} --backend ${BACKEND} ${EXTRA_ARGS}--python ${PYTHON_MAJOR_MINOR_VERSION} --db-reset --test-type ${TEST_TYPE} shell"
+        >&2 echo "*      ./breeze --github-image-id ${GITHUB_REGISTRY_PULL_IMAGE_TAG} --backend ${BACKEND} ${EXTRA_ARGS}--python ${PYTHON_MAJOR_MINOR_VERSION} --db-reset --skip-mounting-local-sources --test-type ${TEST_TYPE} shell"
         >&2 echo "*"
     fi
     >&2 echo "*"