Skip to content

Commit

Permalink
Enable PIP check for both CI and PROD image (#12664)
Browse files Browse the repository at this point in the history
This PR enables PIP check after constraints have been updated
to be stable and 'pip check' compliant in #12636
  • Loading branch information
potiuk authored Nov 27, 2020
1 parent 6b3c6ad commit fa8af2d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ ENV AIRFLOW_CONSTRAINTS_LOCATION=${AIRFLOW_CONSTRAINTS_LOCATION}

# By changing the CI build epoch we can force reinstalling Airflow from the current master
# It can also be overwritten manually by setting the AIRFLOW_CI_BUILD_EPOCH environment variable.
ARG AIRFLOW_CI_BUILD_EPOCH="2"
ARG AIRFLOW_CI_BUILD_EPOCH="3"
ENV AIRFLOW_CI_BUILD_EPOCH=${AIRFLOW_CI_BUILD_EPOCH}

ARG AIRFLOW_PRE_CACHED_PIP_PACKAGES="true"
Expand Down
3 changes: 1 addition & 2 deletions scripts/ci/images/ci_wait_for_ci_image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ function verify_ci_image_dependencies {
push_pull_remove_images::pull_image_github_dockerhub "${AIRFLOW_CI_IMAGE}" \
"${GITHUB_REGISTRY_AIRFLOW_CI_IMAGE}:${GITHUB_REGISTRY_PULL_IMAGE_TAG}"

# TODO: remove the | true after we fixed pip check for prod image
docker run --rm --entrypoint /bin/bash "${AIRFLOW_CI_IMAGE}" -c 'pip check' || true
docker run --rm --entrypoint /bin/bash "${AIRFLOW_CI_IMAGE}" -c 'pip check'
}

push_pull_remove_images::check_if_github_registry_wait_for_image_enabled
Expand Down
3 changes: 1 addition & 2 deletions scripts/ci/images/ci_wait_for_prod_image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ function verify_prod_image_dependencies {
push_pull_remove_images::pull_image_github_dockerhub "${AIRFLOW_PROD_IMAGE}" \
"${GITHUB_REGISTRY_AIRFLOW_PROD_IMAGE}:${GITHUB_REGISTRY_PULL_IMAGE_TAG}"

# TODO: remove the | true after we fixed pip check for prod image
docker run --rm --entrypoint /bin/bash "${AIRFLOW_PROD_IMAGE}" -c 'pip check' || true
docker run --rm --entrypoint /bin/bash "${AIRFLOW_PROD_IMAGE}" -c 'pip check'
}

push_pull_remove_images::check_if_github_registry_wait_for_image_enabled
Expand Down

0 comments on commit fa8af2d

Please sign in to comment.