Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AIRFLOW-4116] Multi-staging includes CI image [Step 2/3] #4937

Merged
merged 1 commit into from
Jun 9, 2019

Conversation

potiuk
Copy link
Member

@potiuk potiuk commented Mar 18, 2019

Make sure you have checked all steps below.

Jira

Description

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

This is 2nd stage of parent https://issues.apache.org/jira/browse/AIRFLOW-3718 task. It implements CI image and add custom hook/build script that builds both images in parallel.

Tests

  • Tests will be added in the third stage of the change where Travis CI will be switched to use those images for testing.

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

No documentation needed for that change. Design is documented in https://cwiki.apache.org/confluence/display/AIRFLOW/AIP-10+Multi-layered+and+multi-stage+official+Airflow+image

Follow up documentation will be added in Simplified Development Workflow change: #4932

Code Quality

  • Passes flake8

@potiuk potiuk changed the title Multi-staging includes CI image [AIRFLOW-4116] Multi-staging includes CI image Mar 18, 2019
@potiuk potiuk changed the title [AIRFLOW-4116] Multi-staging includes CI image [AIRFLOW-4116] Multi-staging includes CI image [Step 2/3] Mar 18, 2019
@potiuk potiuk closed this Mar 18, 2019
@potiuk potiuk reopened this Mar 18, 2019
@potiuk potiuk closed this Mar 18, 2019
@potiuk potiuk reopened this Mar 18, 2019
@potiuk potiuk force-pushed the ms-ci-image branch 2 times, most recently from b1a8caa to ceee58c Compare March 19, 2019 01:03
@codecov-io
Copy link

codecov-io commented Mar 19, 2019

Codecov Report

Merging #4937 into master will increase coverage by <.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #4937      +/-   ##
==========================================
+ Coverage   79.02%   79.02%   +<.01%     
==========================================
  Files         481      481              
  Lines       30203    30203              
==========================================
+ Hits        23868    23869       +1     
+ Misses       6335     6334       -1
Impacted Files Coverage Δ
airflow/models/taskinstance.py 92.61% <0%> (+0.17%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 02ef974...c25a27e. Read the comment docs.

Copy link
Contributor

@gerardo gerardo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is also in #4936

.dockerignore Outdated Show resolved Hide resolved
.hadolint.yaml Outdated Show resolved Hide resolved
@potiuk
Copy link
Member Author

potiuk commented Mar 19, 2019

!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
Note to reviewer: Please review only the last commit (use commits section above). This change is based on yet unmerged #4936 change and it contains also commit from that change. It's a github limitation unfortunately.
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

@potiuk potiuk force-pushed the ms-ci-image branch 2 times, most recently from 8a1c1b8 to a906d91 Compare March 24, 2019 20:34
Dockerfile Show resolved Hide resolved
Dockerfile Show resolved Hide resolved
Dockerfile Outdated Show resolved Hide resolved
Dockerfile Outdated Show resolved Hide resolved
Dockerfile Show resolved Hide resolved
@potiuk potiuk force-pushed the ms-ci-image branch 5 times, most recently from ee72f62 to 24a8f4c Compare April 1, 2019 05:53
Copy link
Member Author

@potiuk potiuk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @ashb @Fokko - I think that commit should be pretty good for further steps and raising the AIP on the devlist? What do you think? Do you have any further comments?

hooks/build Show resolved Hide resolved
@potiuk potiuk force-pushed the ms-ci-image branch 2 times, most recently from 2a37fe2 to a3ccf6c Compare April 7, 2019 14:43
@Fokko
Copy link
Contributor

Fokko commented Jun 2, 2019

I understand. I’ll look into it tomorrow!

Dockerfile Show resolved Hide resolved
Dockerfile Show resolved Hide resolved
Dockerfile Show resolved Hide resolved
Dockerfile Outdated Show resolved Hide resolved
Dockerfile-context Show resolved Hide resolved
hooks/build Show resolved Hide resolved
Copy link
Contributor

@Fokko Fokko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking great @potiuk

I have some comments about esthetical and about version control, would be great to resolve these. Apart from that: LGTM.

Dockerfile Outdated Show resolved Hide resolved
Dockerfile Outdated Show resolved Hide resolved
Dockerfile Outdated Show resolved Hide resolved
Dockerfile Show resolved Hide resolved
scripts/ci/docker-compose.yml Outdated Show resolved Hide resolved
@potiuk
Copy link
Member Author

potiuk commented Jun 4, 2019

Thanks for the feedback @Fokko and @ashb - I addressed I think all of the feedback. There is one remaining query @ashb - about separating airflow sources from the dag/logs files - see the unresolved conversation above.. I will run the last round of tests/CI builds with it and will merge it as soon as I got it all tested if you are ok with my proposal.

@ashb
Copy link
Member

ashb commented Jun 5, 2019

@potiuk Looking good now.

#4937 (comment) I think is resolved?

Last two outstanding issues are

Right? Step 3/3 will be to actually change our CI to use these images right?

@potiuk
Copy link
Member Author

potiuk commented Jun 6, 2019

@ashb -> All resolved now except changing potiuk->airflow. I am flying back home from the Airflow Bay Area meetup (which was awesome BTW) and once I get pass the jetlag I will merge it and proceed with fixing last test failure in 3/3 and we can hopefully close the AIP and proceed to Simplified Development Workflow. I had fantastic response from the people at the meetup about Breeze :)

@potiuk potiuk force-pushed the ms-ci-image branch 5 times, most recently from 72ed8c9 to c25a27e Compare June 9, 2019 11:33
@potiuk potiuk merged commit 78c592a into apache:master Jun 9, 2019
@potiuk potiuk deleted the ms-ci-image branch June 9, 2019 15:21
@Fokko
Copy link
Contributor

Fokko commented Jun 10, 2019

Nice, great work @potiuk

potiuk added a commit that referenced this pull request Jul 20, 2019
ashb pushed a commit to ashb/airflow that referenced this pull request Jul 23, 2019
andriisoldatenko pushed a commit to andriisoldatenko/airflow that referenced this pull request Jul 26, 2019
wmorris75 pushed a commit to modmed/incubator-airflow that referenced this pull request Jul 29, 2019
dharamsk pushed a commit to postmates/airflow that referenced this pull request Aug 8, 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.

7 participants