Repository: incubator-airflow Updated Branches: refs/heads/master 3f1bfd38c -> 0f8507ae3
[AIRFLOW-2335] fix issue with jdk8 download for ci Make sure you have checked _all_ steps below. - [x] My PR addresses the following [Airflow JIRA] (https://issues.apache.org/jira/browse/AIRFLOW/) issues and references them in the PR title. For example, "\[AIRFLOW-XXX\] My Airflow PR" - https://issues.apache.org/jira/browse/AIRFLOW-2335 - In case you are fixing a typo in the documentation you can prepend your commit with \[AIRFLOW-XXX\], code changes always need a JIRA issue. - [x] Here are some details about my PR, including screenshots of any UI changes: There is an issue with travis pulling jdk8 that is preventing CI jobs from running. This blocks further development of the project. Reference: https://github.com/travis-ci/travis- ci/issues/9512#issuecomment-382235301 - [x] My PR adds the following unit tests __OR__ does not need testing for this extremely good reason: This PR can't be unit tested since it is just configuration. However, the fact that unit tests run successfully should show that it works. - [ ] My commits all reference JIRA issues in their subject lines, and I have squashed multiple commits if they address the same issue. In addition, my commits follow the guidelines from "[How to write a good git commit message](http://chris.beams.io/posts/git- commit/)": 1. Subject is separated from body by a blank line 2. Subject is limited to 50 characters 3. Subject does not end with a period 4. Subject uses the imperative mood ("add", not "adding") 5. Body wraps at 72 characters 6. Body explains "what" and "why", not "how" - [ ] In case of new functionality, my PR adds documentation that describes how to use it. - When adding new operators/hooks/sensors, the autoclass documentation generation needs to be added. - [ ] Passes `git diff upstream/master -u -- "*.py" | flake8 --diff` Closes #3236 from dimberman/AIRFLOW- 2335_travis_issue Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/0f8507ae Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/0f8507ae Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/0f8507ae Branch: refs/heads/master Commit: 0f8507ae351787e086d1d1038f6f0ba52e6d9aaa Parents: 3f1bfd3 Author: Daniel Imberman <danielryan2...@gmail.com> Authored: Tue Apr 17 21:57:14 2018 -0700 Committer: Arthur Wiedmer <awied...@netflix.com> Committed: Tue Apr 17 21:57:42 2018 -0700 ---------------------------------------------------------------------- .travis.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/0f8507ae/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index d9a333d..883473d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -37,7 +37,6 @@ addons: - krb5-user - krb5-kdc - krb5-admin-server - - oracle-java8-installer - python-selinux postgresql: "9.2" python: @@ -93,7 +92,19 @@ before_install: - cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys - ln -s ~/.ssh/authorized_keys ~/.ssh/authorized_keys2 - chmod 600 ~/.ssh/* + - sudo add-apt-repository -y ppa:webupd8team/java + - sudo apt-get update + - sudo apt-get install -y oracle-java8-installer || true + #todo remove this kludge and the above || true when the ppa is fixed + - cd /var/lib/dpkg/info + - sudo sed -i 's|JAVA_VERSION=8u161|JAVA_VERSION=8u172|' oracle-java8-installer.* + - sudo sed -i 's|PARTNER_URL=http://download.oracle.com/otn-pub/java/jdk/8u161-b12/2f38c3b165be4555a1fa6e98c45e0808/|PARTNER_URL=http://download.oracle.com/otn-pub/java/jdk/8u172-b11/a58eab1ec242421181065cdc37240b08/|' oracle-java8-installer.* + - sudo sed -i 's|SHA256SUM_TGZ="6dbc56a0e3310b69e91bb64db63a485bd7b6a8083f08e48047276380a0e2021e"|SHA256SUM_TGZ="28a00b9400b6913563553e09e8024c286b506d8523334c93ddec6c9ec7e9d346"|' oracle-java8-installer.* + - sudo sed -i 's|J_DIR=jdk1.8.0_161|J_DIR=jdk1.8.0_172|' oracle-java8-installer.* + - sudo apt-get update + - sudo apt-get install -y oracle-java8-installer - jdk_switcher use oraclejdk8 + - cd $TRAVIS_BUILD_DIR install: - pip install --upgrade pip - pip install tox
