Skip to content

[AIRFLOW-5886] - fixed a bit too selective Dockerfile copy#6570

Merged
mik-laj merged 1 commit intoapache:masterfrom
PolideaInternal:fix-selective-docker-image
Nov 13, 2019
Merged

[AIRFLOW-5886] - fixed a bit too selective Dockerfile copy#6570
mik-laj merged 1 commit intoapache:masterfrom
PolideaInternal:fix-selective-docker-image

Conversation

@potiuk
Copy link
Copy Markdown
Member

@potiuk potiuk commented Nov 13, 2019

Make sure you have checked all steps below.

Jira

Description

  • Here are some details about my PR, including screenshots of any UI changes:

Tests

  • My PR adds the following unit tests OR does not need testing for this extremely good reason:

Commits

  • 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":
    1. Subject is separated from body by a blank line
    2. Subject is limited to 50 characters (not including Jira issue reference)
    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"

Documentation

  • In case of new functionality, my PR adds documentation that describes how to use it.
    • All the public functions and the classes in the PR contain docstrings that explain what it does
    • If you implement backwards incompatible changes, please leave a note in the Updating.md so we can assign it to a appropriate release

@potiuk
Copy link
Copy Markdown
Member Author

potiuk commented Nov 13, 2019

It was a bit too selective change - I have to copy the whole CI folder as we also need the CI scripts for DinD Kind operations - i.e. docker builds executed inside the docker container :). I think I must have seen a wrong CI output and merged it hastily yesterday (among 15+ merges I've done yesterday :). I'd fix it without waiting for Travis so that some PRs can be rebased quickly.

@potiuk
Copy link
Copy Markdown
Member Author

potiuk commented Nov 13, 2019

Fun fact for the curious ones - I know the reason it was Green yesterday - because of a the weird Kubernetes test dependency we have.

Currently Kubernetes tests are testing the PREVIOUS MASTER Docker image not the CURRENT SOURCES (not good) so when the PR was run, it was Green as previous Docker file had all the files and the new one did not. So after merge it kind of tripped over its own feet and got broken.

Luckily the permanent fix for the Kubernetes “previous master vs. current” is coming in #6516 which is next in line to merge.

@mik-laj mik-laj merged commit 2897624 into apache:master Nov 13, 2019
@potiuk
Copy link
Copy Markdown
Member Author

potiuk commented Nov 13, 2019

Thanks @mik-laj !

GnunuX pushed a commit to GnunuX/airflow that referenced this pull request Nov 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants