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/12/09 19:26:21 UTC
[airflow] branch v2-0-test updated: Update default versions
v2-0-test in the 2.0 branch (#12962)
This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch v2-0-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/v2-0-test by this push:
new 4527ddc Update default versions v2-0-test in the 2.0 branch (#12962)
4527ddc is described below
commit 4527ddc4868d01142d91ba2b7c90cd056fddb0ff
Author: Jarek Potiuk <ja...@polidea.com>
AuthorDate: Wed Dec 9 20:25:02 2020 +0100
Update default versions v2-0-test in the 2.0 branch (#12962)
---
Dockerfile | 2 +-
scripts/ci/libraries/_initialization.sh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 4ea0438..bf974817 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -159,7 +159,7 @@ ARG AIRFLOW_EXTRAS
ARG ADDITIONAL_AIRFLOW_EXTRAS=""
ENV AIRFLOW_EXTRAS=${AIRFLOW_EXTRAS}${ADDITIONAL_AIRFLOW_EXTRAS:+,}${ADDITIONAL_AIRFLOW_EXTRAS}
-ARG AIRFLOW_CONSTRAINTS_REFERENCE="constraints-master"
+ARG AIRFLOW_CONSTRAINTS_REFERENCE="constraints-2-0"
ARG AIRFLOW_CONSTRAINTS_LOCATION="https://raw.githubusercontent.com/apache/airflow/${AIRFLOW_CONSTRAINTS_REFERENCE}/constraints-${PYTHON_MAJOR_MINOR_VERSION}.txt"
ENV AIRFLOW_CONSTRAINTS_LOCATION=${AIRFLOW_CONSTRAINTS_LOCATION}
diff --git a/scripts/ci/libraries/_initialization.sh b/scripts/ci/libraries/_initialization.sh
index 1f2984d..26dd9b9 100644
--- a/scripts/ci/libraries/_initialization.sh
+++ b/scripts/ci/libraries/_initialization.sh
@@ -184,8 +184,8 @@ function initialization::initialize_base_variables() {
# Determine current branch
function initialization::initialize_branch_variables() {
# Default branch used - this will be different in different branches
- export DEFAULT_BRANCH=${DEFAULT_BRANCH="master"}
- export DEFAULT_CONSTRAINTS_BRANCH=${DEFAULT_CONSTRAINTS_BRANCH="constraints-master"}
+ export DEFAULT_BRANCH=${DEFAULT_BRANCH="v2-0-test"}
+ export DEFAULT_CONSTRAINTS_BRANCH=${DEFAULT_CONSTRAINTS_BRANCH="constraints-2-0"}
readonly DEFAULT_BRANCH
readonly DEFAULT_CONSTRAINTS_BRANCH