You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by GitBox <gi...@apache.org> on 2019/01/05 16:32:14 UTC

[GitHub] kaxil closed pull request #4441: [AIRFLOW-3612] Remove remaining incubator mention

kaxil closed pull request #4441: [AIRFLOW-3612] Remove remaining incubator mention
URL: https://github.com/apache/airflow/pull/4441
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/scripts/ci/5-run-tests.sh b/scripts/ci/5-run-tests.sh
index bac2cf5bd7..e5f6722dd9 100755
--- a/scripts/ci/5-run-tests.sh
+++ b/scripts/ci/5-run-tests.sh
@@ -19,6 +19,7 @@
 #  under the License.
 
 set -o verbose
+set -e
 
 if [ -z "$HADOOP_HOME" ]; then
     echo "HADOOP_HOME not set - abort" >&2
@@ -55,6 +56,12 @@ which airflow > /dev/null || python setup.py develop
 # (which contains /usr/local/bin)
 sudo ln -sf "${VIRTUAL_ENV}/bin/airflow" /usr/local/bin/
 
+# Fix codecov build path
+if [ ! -h /home/travis/build/apache/airflow ]; then
+  sudo mkdir -p /home/travis/build/apache
+  sudo ln -s ${ROOTDIR} /home/travis/build/apache/airflow
+fi
+
 if [ -z "$KUBERNETES_VERSION" ]; then
   echo "Initializing the DB"
   yes | airflow initdb
@@ -91,11 +98,5 @@ fi
 echo "Starting the unit tests with the following nose arguments: "$nose_args
 nosetests $nose_args
 
-# Fix codecov build path
-if [ ! -h /home/travis/build/apache/incubator-airflow ]; then
-  sudo mkdir -p /home/travis/build/apache
-  sudo ln -s ${ROOTDIR} /home/travis/build/apache/incubator-airflow
-fi
-
 # To run individual tests:
 # nosetests tests.core:CoreTest.test_scheduler_job
diff --git a/scripts/ci/kubernetes/kube/deploy.sh b/scripts/ci/kubernetes/kube/deploy.sh
index 9bc20e0b78..fe933b3062 100755
--- a/scripts/ci/kubernetes/kube/deploy.sh
+++ b/scripts/ci/kubernetes/kube/deploy.sh
@@ -81,7 +81,7 @@ else
     CONFIGMAP_GIT_DAGS_FOLDER_MOUNT_POINT=/root/airflow/dags
     CONFIGMAP_DAGS_VOLUME_CLAIM=
 fi
-CONFIGMAP_GIT_REPO=${TRAVIS_REPO_SLUG:-apache/incubator-airflow}
+CONFIGMAP_GIT_REPO=${TRAVIS_REPO_SLUG:-apache/airflow}
 CONFIGMAP_BRANCH=${TRAVIS_BRANCH:-master}
 
 _UNAME_OUT=$(uname -s)


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services