You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by bo...@apache.org on 2016/08/09 13:10:01 UTC
[1/2] incubator-airflow git commit: [AIRFLOW-404] Retry download if
unpacking fails for hive
Repository: incubator-airflow
Updated Branches:
refs/heads/master 9d254a317 -> 2c3d0fdbe
[AIRFLOW-404] Retry download if unpacking fails for hive
Travis cache can have a faulty files. This results in builds
that fail as they are dependent on certain components being
available, ie. hive. This addresses the issue for hive by
redownloading if unpacking fails.
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/1d67d629
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/1d67d629
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/1d67d629
Branch: refs/heads/master
Commit: 1d67d6293edb299e9d3a8b4f52d2046a6264ee90
Parents: c567930
Author: Bolke de Bruin <bo...@xs4all.nl>
Authored: Tue Aug 9 15:00:25 2016 +0200
Committer: Bolke de Bruin <bo...@xs4all.nl>
Committed: Tue Aug 9 15:00:25 2016 +0200
----------------------------------------------------------------------
scripts/ci/setup_env.sh | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/1d67d629/scripts/ci/setup_env.sh
----------------------------------------------------------------------
diff --git a/scripts/ci/setup_env.sh b/scripts/ci/setup_env.sh
index 9df4d81..e093ff4 100755
--- a/scripts/ci/setup_env.sh
+++ b/scripts/ci/setup_env.sh
@@ -123,6 +123,17 @@ echo "Downloading and unpacking hive"
curl -z ${TRAVIS_CACHE}/hive/hive.tar.gz -o ${TRAVIS_CACHE}/hive/hive.tar.gz -L ${HIVE_URL}
tar zxf ${TRAVIS_CACHE}/hive/hive.tar.gz --strip-components 1 -C ${HIVE_HOME}
+if [ $? != 0 ]; then
+ echo "Failed to extract hive from ${TRAVIS_CACHE}/hive/hive.tar.gz" >&2
+ echo "Trying again..." >&2
+ # dont use cache
+ curl -o ${TRAVIS_CACHE}/hive/hive.tar.gz -L ${HIVE_URL}
+ tar zxf ${TRAVIS_CACHE}/hive/hive.tar.gz --strip-components 1 -C ${HIVE_HOME}
+ if [ $? != 0 ]; then
+ echo "Failed twice in downloading and unpacking hive!" >&2
+ exit 1
+ fi
+fi
echo "Downloading and unpacking minicluster"
curl -z ${TRAVIS_CACHE}/minicluster/minicluster.zip -o ${TRAVIS_CACHE}/minicluster/minicluster.zip -L ${MINICLUSTER_URL}
[2/2] incubator-airflow git commit: Merge remote-tracking branch
'apache/master'
Posted by bo...@apache.org.
Merge remote-tracking branch 'apache/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/2c3d0fdb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/2c3d0fdb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/2c3d0fdb
Branch: refs/heads/master
Commit: 2c3d0fdbe984241a6a5ed126b7edb5f148998047
Parents: 1d67d62 9d254a3
Author: Bolke de Bruin <bo...@xs4all.nl>
Authored: Tue Aug 9 15:09:51 2016 +0200
Committer: Bolke de Bruin <bo...@xs4all.nl>
Committed: Tue Aug 9 15:09:51 2016 +0200
----------------------------------------------------------------------
airflow/bin/cli.py | 157 ++++++++++++++++++++++++++++++++----
airflow/configuration.py | 12 ++-
airflow/models.py | 2 +-
airflow/settings.py | 5 ++
airflow/www/app.py | 3 +
airflow/www/gunicorn_config.py | 23 ++++++
dags/test_dag.py | 37 +++++++++
dags/testdruid.py | 33 --------
scripts/ci/requirements.txt | 1 +
9 files changed, 223 insertions(+), 50 deletions(-)
----------------------------------------------------------------------