(airflow) branch main updated: Trigger full cache rebuild with new EPOCH values (#37346)

[potiuk]

This is an automated email from the ASF dual-hosted git repository.

potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/main by this push:
     new 0ddb7a5e7e Trigger full cache rebuild with new EPOCH values (#37346)
0ddb7a5e7e is described below

commit 0ddb7a5e7ebca3b9175757d122c7bbdf91d7b9dd
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Mon Feb 12 00:15:53 2024 +0100

    Trigger full cache rebuild with new EPOCH values (#37346)
    
    Now when we have a complete mechanism for installing all devel
    dependencies we should trigger a clean cache refresh, so that those
    main branch dependencies can be reflected in the cached "branch tip"
    layer.
---
 Dockerfile    | 5 +++++
 Dockerfile.ci | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 77a8e4e8d6..265b10d5f4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1372,6 +1372,11 @@ ARG INSTALL_PACKAGES_FROM_CONTEXT="false"
 # from eager-upgraded constraints by the CI builds
 ARG USE_CONSTRAINTS_FOR_CONTEXT_PACKAGES="false"
 
+# By changing the epoch we can force reinstalling Airflow and pip all 
dependencies
+# It can also be overwritten manually by setting the AIRFLOW_CI_BUILD_EPOCH 
environment variable.
+ARG AIRFLOW_CI_BUILD_EPOCH="10"
+ENV AIRFLOW_CI_BUILD_EPOCH=${AIRFLOW_CI_BUILD_EPOCH}
+
 # In case of Production build image segment we want to pre-install main 
version of airflow
 # dependencies from GitHub so that we do not have to always reinstall it from 
the scratch.
 # The Airflow and providers are uninstalled, only dependencies remain
diff --git a/Dockerfile.ci b/Dockerfile.ci
index 4456ff89c0..4b6968f096 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -1073,7 +1073,7 @@ ARG AIRFLOW_CONSTRAINTS_LOCATION=""
 ARG DEFAULT_CONSTRAINTS_BRANCH="constraints-main"
 # By changing the epoch we can force reinstalling Airflow and pip all 
dependencies
 # It can also be overwritten manually by setting the AIRFLOW_CI_BUILD_EPOCH 
environment variable.
-ARG AIRFLOW_CI_BUILD_EPOCH="7"
+ARG AIRFLOW_CI_BUILD_EPOCH="10"
 ARG AIRFLOW_PRE_CACHED_PIP_PACKAGES="true"
 ARG AIRFLOW_PIP_VERSION=24.0
 # Setup PIP