ci(checkout): selectively merge master with pr branch (#14307)

.github/workflows/airflow-plugin.yml

@@ -61,7 +61,7 @@ jobs:
           distribution: "zulu"
           java-version: 17
       - uses: gradle/actions/setup-gradle@v4
-      - uses: acryldata/sane-checkout-action@v3
+      - uses: acryldata/sane-checkout-action@v4
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}

.github/workflows/build-and-test.yml

@@ -39,7 +39,7 @@ jobs:
       elasticsearch_setup_change: ${{ steps.ci-optimize.outputs.elasticsearch-setup-change == 'true' }}
     steps:
       - name: Check out the repo
-        uses: acryldata/sane-checkout-action@v3
+        uses: acryldata/sane-checkout-action@v4
       - uses: ./.github/actions/ci-optimization
         id: ci-optimize
 
@@ -70,7 +70,9 @@ jobs:
         with:
           timezoneLinux: ${{ matrix.timezone }}
       - name: Check out the repo
-        uses: acryldata/sane-checkout-action@v3
+        uses: acryldata/sane-checkout-action@v4
+        with:
+          checkout-head-only: false
       - uses: actions/setup-python@v5
         with:
           python-version: "3.10"
@@ -207,7 +209,7 @@ jobs:
     if: ${{ needs.setup.outputs.docker_change == 'true' }}
     steps:
       - name: Check out the repo
-        uses: acryldata/sane-checkout-action@v3
+        uses: acryldata/sane-checkout-action@v4
       - uses: actions/setup-python@v5
         with:
           python-version: "3.10"

.github/workflows/check-datahub-jars.yml

@@ -28,7 +28,7 @@ jobs:
         command: ["datahub-client", "datahub-protobuf", "spark-lineage"]
     runs-on: ubuntu-latest
     steps:
-      - uses: acryldata/sane-checkout-action@v3
+      - uses: acryldata/sane-checkout-action@v4
       - uses: actions/setup-python@v5
         with:
           python-version: "3.10"

.github/workflows/code-checks.yml

@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
-        uses: acryldata/sane-checkout-action@v3
+        uses: acryldata/sane-checkout-action@v4
       - uses: actions/setup-python@v5
         with:
           python-version: "3.10"

.github/workflows/dagster-plugin.yml

@@ -49,7 +49,7 @@ jobs:
           distribution: "zulu"
           java-version: 17
       - uses: gradle/actions/setup-gradle@v4
-      - uses: acryldata/sane-checkout-action@v3
+      - uses: acryldata/sane-checkout-action@v4
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}

.github/workflows/docker-ingestion-smoke.yml

@@ -25,7 +25,7 @@ jobs:
       python_release_version: ${{ steps.python_release_version.outputs.release_version }}
     steps:
       - name: Checkout
-        uses: acryldata/sane-checkout-action@v3
+        uses: acryldata/sane-checkout-action@v4
       - name: Compute Tag
         id: tag
         env:
@@ -53,7 +53,7 @@ jobs:
     if: ${{ needs.setup.outputs.publish == 'true' }}
     steps:
       - name: Check out the repo
-        uses: acryldata/sane-checkout-action@v3
+        uses: acryldata/sane-checkout-action@v4
       - name: Build and push
         uses: ./.github/actions/docker-custom-build-and-push
         with:

.github/workflows/docker-unified.yml

@@ -75,7 +75,7 @@ jobs:
       yarn_cache_key_prefix: ${{ steps.yarn-cache-key.outputs.yarn_cache_key_prefix }}
     steps:
       - name: Check out the repo
-        uses: acryldata/sane-checkout-action@v3
+        uses: acryldata/sane-checkout-action@v4
       - name: Compute Tag
         id: tag
         env:
@@ -176,7 +176,7 @@ jobs:
     if: ${{ needs.setup.outputs.smoke_test_change == 'true' }}
     steps:
       - name: Check out the repo
-        uses: acryldata/sane-checkout-action@v3
+        uses: acryldata/sane-checkout-action@v4
 
       - uses: actions/setup-python@v5
         with:
@@ -241,7 +241,9 @@ jobs:
         uses: depot/setup-action@v1
 
       - name: Check out the repo
-        uses: acryldata/sane-checkout-action@v3
+        uses: acryldata/sane-checkout-action@v4
+        with:
+          checkout-head-only: false
 
       - uses: actions/setup-python@v5
         with:
@@ -303,7 +305,7 @@ jobs:
       matrix: ${{ fromJson(needs.base_build.outputs.matrix) }}
     steps:
       - name: Checkout # adding checkout step just to make trivy upload happy
-        uses: acryldata/sane-checkout-action@v3
+        uses: acryldata/sane-checkout-action@v4
       - id: download_image
         name: Download images from depot
         if: ${{ needs.setup.outputs.use_depot_cache == 'true' }}
@@ -418,7 +420,9 @@ jobs:
             ${{ needs.setup.outputs.yarn_cache_key_prefix }}
 
       - name: Check out the repo
-        uses: acryldata/sane-checkout-action@v3
+        uses: acryldata/sane-checkout-action@v4
+        with:
+          checkout-head-only: false
 
       - name: Set up Depot CLI
         if: ${{ needs.setup.outputs.use_depot_cache == 'true' }}

.github/workflows/github-actions-format.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
-        uses: acryldata/sane-checkout-action@v3
+        uses: acryldata/sane-checkout-action@v4
       - uses: actions/setup-python@v5
         with:
           python-version: "3.10"

.github/workflows/gx-plugin.yml

@@ -49,7 +49,7 @@ jobs:
           distribution: "zulu"
           java-version: 17
       - uses: gradle/actions/setup-gradle@v4
-      - uses: acryldata/sane-checkout-action@v3
+      - uses: acryldata/sane-checkout-action@v4
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}

.github/workflows/lint-actions.yml

@@ -10,7 +10,7 @@ jobs:
   actionlint:
     runs-on: ubuntu-latest
     steps:
-      - uses: acryldata/sane-checkout-action@v3
+      - uses: acryldata/sane-checkout-action@v4
       - uses: reviewdog/action-actionlint@v1
         with:
           reporter: github-pr-review

.github/workflows/markdown-format.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
-        uses: acryldata/sane-checkout-action@v3
+        uses: acryldata/sane-checkout-action@v4
       - uses: actions/setup-python@v5
         with:
           python-version: "3.10"

.github/workflows/metadata-ingestion.yml

@@ -65,7 +65,9 @@ jobs:
           distribution: "zulu"
           java-version: 17
       - uses: gradle/actions/setup-gradle@v4
-      - uses: acryldata/sane-checkout-action@v3
+      - uses: acryldata/sane-checkout-action@v4
+        with:
+          checkout-head-only: false
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}

.github/workflows/metadata-io.yml

@@ -46,7 +46,9 @@ jobs:
       elasticsearch_setup_change: ${{ steps.ci-optimize.outputs.elasticsearch-setup-change == 'true' }}
     steps:
       - name: Check out the repo
-        uses: acryldata/sane-checkout-action@v3
+        uses: acryldata/sane-checkout-action@v4
+        with:
+          checkout-head-only: false
       - uses: ./.github/actions/ci-optimization
         id: ci-optimize
   build:
@@ -61,7 +63,9 @@ jobs:
           sudo docker image prune -a -f || true
       - name: Disk Check
         run: df -h . && docker images
-      - uses: acryldata/sane-checkout-action@v3
+      - uses: acryldata/sane-checkout-action@v4
+        with:
+          checkout-head-only: false
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:

.github/workflows/metadata-model.yml

@@ -33,7 +33,9 @@ jobs:
           distribution: "zulu"
           java-version: 17
       - uses: gradle/actions/setup-gradle@v4
-      - uses: acryldata/sane-checkout-action@v3
+      - uses: acryldata/sane-checkout-action@v4
+        with:
+          checkout-head-only: false
       - uses: actions/setup-python@v5
         with:
           python-version: "3.10"

.github/workflows/prefect-plugin.yml

@@ -44,7 +44,7 @@ jobs:
           distribution: "zulu"
           java-version: 17
       - uses: gradle/actions/setup-gradle@v4
-      - uses: acryldata/sane-checkout-action@v3
+      - uses: acryldata/sane-checkout-action@v4
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}

.github/workflows/publish-datahub-jars.yml

@@ -41,7 +41,7 @@ jobs:
       tag: ${{ steps.tag.outputs.tag }}
     steps:
       - name: Checkout
-        uses: acryldata/sane-checkout-action@v3
+        uses: acryldata/sane-checkout-action@v4
       - name: Compute Tag
         id: tag
         env:
@@ -59,7 +59,7 @@ jobs:
     needs: ["check-secret", "setup"]
     if: ${{ needs.check-secret.outputs.publish-enabled == 'true' }}
     steps:
-      - uses: acryldata/sane-checkout-action@v3
+      - uses: acryldata/sane-checkout-action@v4
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
@@ -212,7 +212,7 @@ jobs:
     needs: ["check-secret", "setup", "publish"]
     if: ${{ needs.check-secret.outputs.publish-enabled == 'true' }}
     steps:
-      - uses: acryldata/sane-checkout-action@v3
+      - uses: acryldata/sane-checkout-action@v4
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:

.github/workflows/python-build-pages.yml

@@ -42,7 +42,7 @@ jobs:
           distribution: "zulu"
           java-version: 17
       - uses: gradle/actions/setup-gradle@v4
-      - uses: acryldata/sane-checkout-action@v3
+      - uses: acryldata/sane-checkout-action@v4
       - uses: actions/setup-python@v5
         with:
           python-version: "3.10"

.github/workflows/react-cloudflare-pages.yml

@@ -26,7 +26,7 @@ jobs:
       frontend_change: ${{ steps.ci-optimize.outputs.frontend-change == 'true' }}
     steps:
       - name: Check out the repo
-        uses: acryldata/sane-checkout-action@v3
+        uses: acryldata/sane-checkout-action@v4
       - uses: ./.github/actions/ci-optimization
         id: ci-optimize
 
@@ -40,7 +40,7 @@ jobs:
     if: ${{ github.event.pull_request.head.repo.fork != 'true' }}
     steps:
       - name: Check out the repo
-        uses: acryldata/sane-checkout-action@v3
+        uses: acryldata/sane-checkout-action@v4
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:

.github/workflows/spark-smoke-test.yml

@@ -30,7 +30,7 @@ jobs:
   spark-smoke-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: acryldata/sane-checkout-action@v3
+      - uses: acryldata/sane-checkout-action@v4
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:

.github/workflows/yaml-format.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
-        uses: acryldata/sane-checkout-action@v3
+        uses: acryldata/sane-checkout-action@v4
       - uses: actions/setup-python@v5
         with:
           python-version: "3.10"

metadata-io/src/test/java/com/linkedin/metadata/system_info/collectors/PropertiesCollectorConfigurationTest.java

@@ -782,7 +782,8 @@ public class PropertiesCollectorConfigurationTest extends AbstractTestNGSpringCo
 
           // Gradle and test-specific properties
           "org.gradle.internal.worker.tmpdir",
-          "org.springframework.boot.test.context.SpringBootTestContextBootstrapper"
+          "org.springframework.boot.test.context.SpringBootTestContextBootstrapper",
+          "datahub.policies.systemPolicyUrnList"
 
           // TODO: Add more properties as they are discovered during testing
           // When this test fails due to unclassified properties, add them to