manual changes

fix dependency-compatibility test

restore generation_config

use hermetic image snapshot

update docker path

test without airlock

restore airlock

Author: chingor13

.github/workflows/ci.yaml

@@ -41,10 +41,69 @@ jobs:
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-unified-${{ steps.date.outputs.week_of_year }}
+    # - name: Install sdk-platform modules
+    #   run: |
+    #     mvn test \
+    #       -B -ntp \
+    #       -Dorg.slf4j.simpleLogger.showDateTime=true \
+    #       -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \
+    #       -Dclirr.skip=true \
+    #       -Denforcer.skip=true \
+    #       -Dcheckstyle.skip=true \
+    #       -Dflatten.skip=true \
+    #       -Danimal.sniffer.skip=true \
+    #       -Dmaven.wagon.http.retryHandler.count=5 \
+    #       -T 1C
+    #   working-directory: sdk-platform-java
     - run: .kokoro/build.sh
       env:
         JOB_TYPE: test
         JOB_NAME: units-${{matrix.java}}
+  units-8-runtime:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Get current week within the year
+      id: date
+      run: echo "::set-output name=week_of_year::$(date +'%W' --utc)"
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
+      with:
+        java-version: 11
+        distribution: temurin
+        cache: maven
+    - run: java -version
+    - uses: actions/cache@v4
+      id: mvn-cache
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-unified-${{ steps.date.outputs.week_of_year }}
+    - name: Install all modules using Java 11
+      shell: bash
+      run: |
+        mvn -V -B -ntp clean install -DskipTests -Dfmt.skip -Dclirr.skip -Denforcer.skip -Dcheckstyle.skip -Dflatten.skip -Danimal-sniffer.skip -Djacoco.skip
+      working-directory: sdk-platform-java
+    - uses: actions/setup-java@v4
+      with:
+        java-version: 8
+        distribution: temurin
+    - run: java -version
+    - name: Run tests in Java 8 with the source compiled in Java 11
+      run: |
+        mvn test \
+          -B -ntp \
+          -Dorg.slf4j.simpleLogger.showDateTime=true \
+          -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \
+          -Dclirr.skip=true \
+          -Denforcer.skip=true \
+          -Dcheckstyle.skip=true \
+          -Dflatten.skip=true \
+          -Danimal.sniffer.skip=true \
+          -Dmaven.wagon.http.retryHandler.count=5 \
+          -T 1C
+      env:
+        JOB_TYPE: test
+        JOB_NAME: units-8-runtime-${{matrix.java}}
+      working-directory: sdk-platform-java
   windows:
     runs-on: windows-latest
     steps:
@@ -92,7 +151,18 @@ jobs:
     - run: java -version
     - name: Install Maven modules to local Maven repository
       run: |
-        mvn install -B -ntp  -T 1C -DskipTests -Dclirr.skip -Dcheckstyle.skip
+        mvn install \
+          -B -ntp \
+          -Dorg.slf4j.simpleLogger.showDateTime=true \
+          -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \
+          -DskipTests \
+          -Dclirr.skip=true \
+          -Denforcer.skip=true \
+          -Dcheckstyle.skip=true \
+          -Dflatten.skip=true \
+          -Danimal.sniffer.skip=true \
+          -Dmaven.wagon.http.retryHandler.count=5 \
+          -T 1C
     - run: java -version
     - run: mvn -B -ntp enforcer:enforce@enforce -T 1C
   gapic-libraries-bom:
@@ -104,6 +174,10 @@ jobs:
         java-version: 11
         distribution: temurin
         cache: maven
+    - name: Install sdk-platform-modules to local Maven repository
+      run: |
+        mvn install -B -ntp  -T 1C -DskipTests -Dclirr.skip -Dcheckstyle.skip -Denforcer.skip
+      working-directory: sdk-platform-java
     - name: Install Maven modules to local Maven repository
       run: |
         mvn install -B -ntp  -T 1C -DskipTests -Dclirr.skip -Dcheckstyle.skip -Denforcer.skip

.github/workflows/generated_files_sync.yaml

@@ -17,7 +17,7 @@ on:
   pull_request:
 name: generation diff
 env:
-  library_generation_image_tag: 2.67.0
+  library_generation_image_tag: 2.67.1-SNAPSHOT
 jobs:
   root-pom:
     # root pom.xml does not have diff from generated one
@@ -164,12 +164,15 @@ jobs:
         
         # java/com/google : This is the standard package
         # samples         : Samples are not shipped as a library
+        # test            : test classes are not shipped as a library
         # grafeas         : java-grafeas is known to have special package name
         # cloud-build v2  : java_package was not configured when we published
         #                   the Cloud Build V2 client library
         # the rest        : the same as above
         invalid_files=$(find . -name '*.java' \
             |grep --invert-match 'java/com/google' \
+            |grep --invert-match '/test/' \
+            |grep --invert-match '/tests/' \
             |grep --invert-match samples \
             |grep --invert-match grafeas \
             |grep --invert-match 'cloud-build.*v2' \

.github/workflows/hermetic_library_generation.yaml

@@ -37,9 +37,10 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.67.0
+    - uses: ./sdk-platform-java/.github/scripts
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}
         head_ref: ${{ github.head_ref }}
         token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
+        image_tag: 2.67.1-SNAPSHOT

.github/workflows/sdk-platform-java-ci.yaml

@@ -3,9 +3,8 @@ on:
     branches:
       - main
   pull_request:
-name: sdk-platform-java ci
-env:
-  BUILD_SUBDIR: sdk-platform-java
+name: sdk-platform-java-ci
+working-directory: sdk-platform-java
 jobs:
   filter:
     runs-on: ubuntu-latest
@@ -25,7 +24,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        java: [ 11, 17]
+        java: [ 11, 17 ]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4

.github/workflows/sdk-platform-java-dependency_compatibility_test.yaml

@@ -55,20 +55,23 @@ jobs:
         shell: bash
         run: |
           if [[ -n "${{ env.DEPENDENCIES_LIST }}" ]]; then
-            ./.github/scripts/test_dependency_compatibility.sh -l ${{ env.DEPENDENCIES_LIST }}
+            .github/scripts/test_dependency_compatibility.sh -l ${{ env.DEPENDENCIES_LIST }}
           else
-            ./.github/scripts/test_dependency_compatibility.sh
+            .github/scripts/test_dependency_compatibility.sh
           fi
+        working-directory: sdk-platform-java
 
       # Install the modules for showcase (Shared-Deps is required to run showcase)
       - name: Install sdk-platform-java's modules
         # gapic-generator-java requires Java 8 and is irrelevant for this CI
         run: mvn -q -B -ntp install --projects '!gapic-generator-java' -Dcheckstyle.skip -Dfmt.skip -DskipTests -Dclirr.skip -T 1C
+        working-directory: sdk-platform-java
 
       # Set up local showcase server to run the showcase ITs
       - name: Parse showcase version
-        working-directory: java-showcase/gapic-showcase
+        working-directory: sdk-plaform-java/java-showcase/gapic-showcase
         run: echo "SHOWCASE_VERSION=$(mvn help:evaluate -Dexpression=gapic-showcase.version -q -DforceStdout)" >> "$GITHUB_ENV"
+        working-directory: sdk-platform-java
       - name: Install showcase server
         run: |
           sudo mkdir -p /usr/src/showcase
@@ -78,15 +81,16 @@ jobs:
           tar -xf showcase-*
           ./gapic-showcase run &
           cd -
+        working-directory: sdk-platform-java
 
       # Run Showcase's Integration Tests
       - name: Perform Dependency Compatibility Integration Testing (Showcase Tests)
         shell: bash
         # Need to cd out of the directory to get the scripts as this step is run inside the java-showcase directory
         run: |
           if [[ -n "${{ env.DEPENDENCIES_LIST }}" ]]; then
-            ../.github/scripts/test_dependency_compatibility.sh -l ${{ env.DEPENDENCIES_LIST }}
+            ../sdk-platform-java/.github/scripts/test_dependency_compatibility.sh -l ${{ env.DEPENDENCIES_LIST }}
           else
-            ../.github/scripts/test_dependency_compatibility.sh -f ../dependencies.txt
+            ../sdk-platform-java/.github/scripts/test_dependency_compatibility.sh -f ../dependencies.txt
           fi
-        working-directory: java-showcase
+        working-directory: sdk-platform-java/java-showcase

.github/workflows/sdk-platform-java-downstream.yaml

@@ -31,7 +31,6 @@ jobs:
       fail-fast: false
       matrix:
         repo:
-          - google-cloud-java
           - java-bigtable
           - java-bigquery
           - java-firestore
@@ -53,9 +52,9 @@ jobs:
           sudo apt-get update
           sudo apt-get -y install libxml2-utils
       - name: Test helper scripts
-        run: ./.kokoro/presubmit/common_test.sh
+        run: ./sdk-platform-java/.kokoro/presubmit/common_test.sh
       - name: Perform downstream compatibility testing
-        run: REPOS_UNDER_TEST="${{ matrix.repo }}" ./.kokoro/presubmit/downstream-compatibility.sh
+        run: REPOS_UNDER_TEST="${{ matrix.repo }}" ./sdk-platform-java/.kokoro/presubmit/downstream-compatibility.sh
   downstream-compatibility-spring-generator:
     needs: filter
     if: ${{ needs.filter.outputs.library == 'true' }}
@@ -74,4 +73,4 @@ jobs:
           sudo apt-get update
           sudo apt-get -y install libxml2-utils
       - name: Perform downstream compatibility testing
-        run: ./.kokoro/presubmit/downstream-compatibility-spring.sh
+        run: ./sdk-platform-java/.kokoro/presubmit/downstream-compatibility-spring.sh

.github/workflows/sdk-platform-java-downstream_protobuf_compatibility_check_nightly.yaml

@@ -44,11 +44,7 @@ jobs:
           - google-cloud-java
           - java-bigtable
           - java-bigquery
-          - java-bigquerystorage
-          - java-datastore
           - java-firestore
-          - java-logging
-          - java-logging-logback
           - java-pubsub
           - java-pubsublite
           - java-spanner-jdbc

.github/workflows/sdk-platform-java-downstream_unmanaged_dependency_check.yaml

@@ -4,8 +4,8 @@ on:
       - main
   pull_request:
     paths:
-      - .github/workflows/downstream_unmanaged_dependency_check.yaml
-      - java-shared-dependencies/**
+      - .github/workflows/sdk-platform-java-downstream_unmanaged_dependency_check.yaml
+      - sdk-platform-java/java-shared-dependencies/**
 
 name: sdk-platform-java Downstream Unmanaged Dependency Check
 env:
@@ -38,7 +38,7 @@ jobs:
       - name: Checkout sdk-platform-java
         uses: actions/checkout@v3
         with:
-          path: sdk-platform-java
+          path: google-cloud-java
       - name: Checkout the downstream repo
         uses: actions/checkout@v4
         with:
@@ -57,17 +57,19 @@ jobs:
           cache: maven
       - name: Install the modules of sdk-platform-java
         shell: bash
-        working-directory: sdk-platform-java
+        working-directory: google-cloud-java/sdk-platform-java
         run: |
           set -euo pipefail
           # gapic-generator-java is irrelevant
-          mvn -q -B -ntp install --projects '!gapic-generator-java' \
+          mvn -q -B -ntp install \
             -Dcheckstyle.skip -Dfmt.skip -DskipTests -T 1C
       - name: Build unmanaged dependency check
         shell: bash
-        working-directory: sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check
+        working-directory: google-cloud-java/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check
         run: |
           set -euo pipefail
+          pwd
+          pwd
           echo "Install Unmanaged Dependency Check in $(pwd)"
           mvn clean install -V --batch-mode --no-transfer-progress -DskipTests
       - name: Install the modules of the downstream repository
@@ -85,7 +87,7 @@ jobs:
           # BOM to list the artifacts generated by that repository.
           bom_dir=$(find ${{ matrix.repo }} -type d -name 'google-*-bom' ! -name '*-deps-bom')
           bom_absolute_path=$(realpath "${bom_dir}/pom.xml")
-          cd sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check
+          cd google-cloud-java/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check
           echo "Running Unmanaged Dependency Check against ${bom_absolute_path}"
           unmanaged_dependencies=$(mvn exec:java -Dexec.args="../pom.xml ${bom_absolute_path}" -q)
           if [[ "${unmanaged_dependencies}" != "[]" ]]; then

.github/workflows/sdk-platform-java-java_compatibility_check.yaml

@@ -42,9 +42,10 @@ jobs:
         java-version: 17
         distribution: temurin
         cache: maven
-    - name: Install Maven modules to local Maven repository
+    - name: Install sdk-platform-modules to local Maven repository
       run: |
         mvn install -B -ntp  -T 1C -DskipTests -Dclirr.skip -Dcheckstyle.skip -Denforcer.skip
+      working-directory: sdk-platform-java
     - name: Check Java 8 compatibility for class files
       shell: bash
       run: |
@@ -60,3 +61,4 @@ jobs:
           fi
         done
         echo "All class files are compatible with Java 8."
+      working-directory: sdk-platform-java

.github/workflows/sdk-platform-java-shared_dependencies.yaml

@@ -41,4 +41,4 @@ jobs:
         mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip
     - name: Check the BOM content satisfies the upper-bound-check test case
       run: mvn -B -V -ntp verify -Dcheckstyle.skip
-      working-directory: java-shared-dependencies/upper-bound-check
+      working-directory: sdk-plaform-java/java-shared-dependencies/upper-bound-check