Reenable PreCommit Flink Container after Fix cleanup scripts (#33957)

* Revert "Disable PreCommit Flink Container (#33956)"

This reverts commit 7ac5bc4.

* Fix clean up scripts

* Fix trigger paths

* Fix script

Author: Abacn

.github/autolabeler.yml

@@ -79,7 +79,7 @@ io:  ["sdks/go/pkg/beam/io/**/*", "sdks/java/io/**/*", "sdks/python/apache_beam/
 
 # Runners
 "runners": ["runners/**/*", "sdks/go/pkg/beam/runners/**/*", "sdks/python/apache_beam/runners/**/*", "sdks/typescript/src/apache_beam/runners/**/*"]
-"core": ["runners/core-construction-java/**/*", "runners/core-java/**/*"]
+"core": ["runners/core-java/**/*"]
 "dataflow": ["runners/google-cloud-dataflow-java/**/*", "sdks/go/pkg/beam/runners/dataflow/**/*", "sdks/python/runners/dataflow/**/*"]
 "direct": ["runners/direct-java/**/*", "sdks/go/pkg/beam/runners/direct/**/*", "sdks/python/runners/direct/**/*"]
 "flink": ["runners/flink/**/*", "sdks/go/pkg/beam/runners/flink/**/*"]

.github/workflows/beam_PreCommit_Flink_Container.yml

@@ -17,10 +17,27 @@ name: PreCommit Flink Container
 
 on:
   pull_request_target:
-    # TODO(https://github.com/apache/beam/pull/33956) re-enable when two issues resolved.
     paths:
+      - 'model/**'
+      - 'sdks/python/apache_beam/runners/portability/**'
+      - 'release/**'
+      - 'runners/core-java/**'
+      - 'runners/flink/**'
+      - 'runners/java-fn-execution/**'
       - '.github/trigger_files/beam_PreCommit_Flink_Container.json'
       - 'release/trigger_all_tests.json'
+  push:
+      tags: [ 'v*' ]
+      branches: [ 'master', 'release-*' ]
+      paths:
+      - 'model/**'
+      - 'sdks/python/apache_beam/runners/portability/**'
+      - 'release/**'
+      - 'runners/core-java/**'
+      - 'runners/flink/**'
+      - 'runners/java-fn-execution/**'
+  schedule:
+    - cron: '0 */6 * * *'
   workflow_dispatch:
 
 # Setting explicit permissions for the action to avoid the default permissions which are `write-all`

.github/workflows/beam_PreCommit_Java_GCP_IO_Direct.yml

@@ -20,7 +20,6 @@ on:
     tags: ['v*']
     branches: ['master', 'release-*']
     paths:
-      - "runners/core-construction-java/**"
       - "runners/core-java/**"
       - "sdks/java/core/src/main/**"
       - "sdks/java/extensions/arrow/**"
@@ -34,7 +33,6 @@ on:
   pull_request_target:
     branches: ['master', 'release-*']
     paths:
-      - "runners/core-construction-java/**"
       - "runners/core-java/**"
       - 'release/trigger_all_tests.json'
       - '.github/trigger_files/beam_PreCommit_Java_GCP_IO_Direct.json'

.github/workflows/beam_PreCommit_Portable_Python.yml

@@ -21,25 +21,21 @@ on:
     branches: ['master', 'release-*']
     paths:
       - 'model/**'
-      - 'runners/core-construction-java/**'
       - 'runners/core-java/**'
       - 'runners/extensions-java/**'
       - 'runners/flink/**'
       - 'runners/java-fn-execution/**'
-      - 'runners/reference/**'
       - 'sdks/python/**'
       - 'release/**'
       - '.github/workflows/beam_PreCommit_Portable_Python.yml'
   pull_request_target:
     branches: ['master', 'release-*']
     paths:
       - 'model/**'
-      - 'runners/core-construction-java/**'
       - 'runners/core-java/**'
       - 'runners/extensions-java/**'
       - 'runners/flink/**'
       - 'runners/java-fn-execution/**'
-      - 'runners/reference/**'
       - 'sdks/python/**'
       - 'release/**'
       - 'release/trigger_all_tests.json'

.github/workflows/beam_PreCommit_Python_PVR_Flink.yml

@@ -23,12 +23,10 @@ on:
       - 'sdks/python/**'
       - 'release/**'
       - 'sdks/java/io/kafka/**'
-      - 'runners/core-construction-java/**'
       - 'runners/core-java/**'
       - 'runners/extensions-java/**'
       - 'runners/flink/**'
       - 'runners/java-fn-execution/**'
-      - 'runners/reference/**'
       - 'release/trigger_all_tests.json'
       - '.github/trigger_files/beam_PreCommit_Python_PVR_Flink.json'
   issue_comment:
@@ -41,12 +39,10 @@ on:
       - 'sdks/python/**'
       - 'release/**'
       - 'sdks/java/io/kafka/**'
-      - 'runners/core-construction-java/**'
       - 'runners/core-java/**'
       - 'runners/extensions-java/**'
       - 'runners/flink/**'
       - 'runners/java-fn-execution/**'
-      - 'runners/reference/**'
       - '.github/workflows/beam_PreCommit_Python_PVR_Flink.yml'
   schedule:
     - cron: '45 2/6 * * *'

.test-infra/dataproc/cleanup.sh

@@ -21,7 +21,8 @@ toDeleteList=( )
 
 
 generatedResources=("beam-loadtests-go-*-flink" "beam-loadtests-python-*-flink" \
-"beam-loadtests-py-*-flink" "beam-postcommit-python-chicago" )
+"beam-loadtests-py-*-flink" "beam-postcommit-python-chicago" \
+"beam-precommit-flink-container" )
 
 function deleteFilteredClusters(){
     for cluster in ${toDeleteList[@]};do

.test-infra/tools/stale_dataflow_prebuilt_image_cleaner.sh

@@ -96,7 +96,7 @@ for image_name in ${IMAGE_NAMES[@]}; do
           # they will have a virtual size of 0 and a created date at the start of the epoch, but their manifests will
           # point to active images. These images should only be deleted when all of their dependencies can be safely
           # deleted.
-          MANIFEST=$(docker manifest inspect ${image_name}@"${current}" || echo "")
+          MANIFEST=$(docker buildx imagetools inspect ${image_name}@"${current}" --raw || echo "")
           if [ -z "$MANIFEST" ]; then
             # Sometimes "no such manifest" seen. Skip current if command hit error
             FAILED_IMAGES+=" $current"