[airflow] branch v1-10-stable updated: Do not upgrade dependencies on v1-10-stable (#11903)

[po...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

potiuk pushed a commit to branch v1-10-stable
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/v1-10-stable by this push:
     new 65df1e8  Do not upgrade dependencies on v1-10-stable (#11903)
65df1e8 is described below

commit 65df1e802190d262b5e18fa9bc2e055768b96e28
Author: Tomek Urbaszek <tu...@gmail.com>
AuthorDate: Mon Nov 2 23:58:58 2020 +0100

    Do not upgrade dependencies on v1-10-stable (#11903)
    
    * Do not upgrade dependencies on v1-10-stable
    
    We should not upgrade the requirements version on v1-10-stable branch
    as it seems to be failing currently:
    https://github.com/apache/airflow/runs/1316476959
---
 .github/workflows/ci.yml                       |  3 ++-
 Dockerfile.ci                                  |  2 +-
 scripts/ci/docker-compose/local.yml            |  2 +-
 scripts/ci/libraries/_initialization.sh        | 14 ++++++++++++++
 scripts/ci/libraries/_local_mounts.sh          |  2 +-
 scripts/{ci => }/in_container/entrypoint_ci.sh |  0
 6 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 412a091..0a94b34 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,7 +31,8 @@ env:
   SKIP_CI_IMAGE_CHECK: "true"
   DB_RESET: "true"
   VERBOSE: "true"
-  UPGRADE_TO_LATEST_CONSTRAINTS: ${{ github.event_name == 'push' || github.event_name == 'scheduled' }}
+  UPGRADE_TO_LATEST_CONSTRAINTS: >
+    ${{ github.event_name == 'scheduled' || (github.event_name == 'push' && github.base_ref == 'master') }}
   PYTHON_MAJOR_MINOR_VERSION: 3.6
   USE_GITHUB_REGISTRY: "true"
   CACHE_IMAGE_PREFIX: ${{ github.repository }}
diff --git a/Dockerfile.ci b/Dockerfile.ci
index 2797e34..248d2b6 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -277,7 +277,7 @@ COPY airflow/www_rbac/static ${AIRFLOW_SOURCES}/airflow/www_rbac/static/
 # Package JS/css for production
 RUN yarn --cwd airflow/www_rbac run prod
 
-COPY scripts/ci/in_container/entrypoint_ci.sh /entrypoint
+COPY scripts/in_container/entrypoint_ci.sh /entrypoint
 RUN chmod a+x /entrypoint
 
 # Copy selected subdirectories only
diff --git a/scripts/ci/docker-compose/local.yml b/scripts/ci/docker-compose/local.yml
index 3e1abab..bb9ae43 100644
--- a/scripts/ci/docker-compose/local.yml
+++ b/scripts/ci/docker-compose/local.yml
@@ -50,7 +50,7 @@ services:
       - ../../../logs:/root/airflow/logs:cached
       - ../../../pytest.ini:/opt/airflow/pytest.ini:cached
       - ../../../scripts:/opt/airflow/scripts:cached
-      - ../../../scripts/ci/in_container/entrypoint_ci.sh:/entrypoint:cached
+      - ../../../scripts/in_container/entrypoint_ci.sh:/entrypoint:cached
       - ../../../setup.cfg:/opt/airflow/setup.cfg:cached
       - ../../../setup.py:/opt/airflow/setup.py:cached
       - ../../../tests:/opt/airflow/tests:cached
diff --git a/scripts/ci/libraries/_initialization.sh b/scripts/ci/libraries/_initialization.sh
index 63041fd..830412d 100644
--- a/scripts/ci/libraries/_initialization.sh
+++ b/scripts/ci/libraries/_initialization.sh
@@ -16,6 +16,19 @@
 # specific language governing permissions and limitations
 # under the License.
 
+# Determine current branch
+function initialization::initialize_branch_variables() {
+    # Default branch used - this will be different in different branches
+    export DEFAULT_BRANCH=${DEFAULT_BRANCH="v1-10-stable"}
+    export DEFAULT_CONSTRAINTS_BRANCH=${DEFAULT_CONSTRAINTS_BRANCH="constraints-1-10"}
+    readonly DEFAULT_BRANCH
+    readonly DEFAULT_CONSTRAINTS_BRANCH
+
+    # Default branch name for triggered builds is the one configured in default branch
+    # We need to read it here as it comes from _common_values.sh
+    export BRANCH_NAME=${BRANCH_NAME:=${DEFAULT_BRANCH}}
+}
+
 # Common environment that is initialized by both Breeze and CI scripts
 function initialize_common_environment {
     # default python Major/Minor version
@@ -222,6 +235,7 @@ function initialize_common_environment {
     # Namespace where airflow is installed via helm
     export HELM_AIRFLOW_NAMESPACE="airflow"
 
+    initialization::initialize_branch_variables
 }
 
 function set_mysql_encoding() {
diff --git a/scripts/ci/libraries/_local_mounts.sh b/scripts/ci/libraries/_local_mounts.sh
index da16744..ec82c15 100644
--- a/scripts/ci/libraries/_local_mounts.sh
+++ b/scripts/ci/libraries/_local_mounts.sh
@@ -46,7 +46,7 @@ function generate_local_mounts_list {
         "$prefix"logs:/root/airflow/logs:cached
         "$prefix"pytest.ini:/opt/airflow/pytest.ini:cached
         "$prefix"scripts:/opt/airflow/scripts:cached
-        "$prefix"scripts/ci/in_container/entrypoint_ci.sh:/entrypoint:cached
+        "$prefix"scripts/in_container/entrypoint_ci.sh:/entrypoint:cached
         "$prefix"setup.cfg:/opt/airflow/setup.cfg:cached
         "$prefix"setup.py:/opt/airflow/setup.py:cached
         "$prefix"tests:/opt/airflow/tests:cached
diff --git a/scripts/ci/in_container/entrypoint_ci.sh b/scripts/in_container/entrypoint_ci.sh
similarity index 100%
rename from scripts/ci/in_container/entrypoint_ci.sh
rename to scripts/in_container/entrypoint_ci.sh