chore(migration): support root centralized custom conformance migration

Author: meltsufin

monorepo-migration/migrate.sh

@@ -220,24 +220,64 @@ EOF
     COMMIT_COUNT=$((COMMIT_COUNT + 1))
 fi
 
-# 6.4c Migrate Integration presubmit config if present
-if [ -f "$SOURCE_REPO_NAME/.kokoro/presubmit/integration.cfg" ]; then
-    echo "Migrating integration.cfg to monorepo root .kokoro/presubmit/${SOURCE_REPO_NAME#java-}-integration.cfg..."
+# 6.4c Migrate Integration presubmit configurations if present
+if ls "$SOURCE_REPO_NAME/.kokoro/presubmit/integration"*.cfg >/dev/null 2>&1; then
     mkdir -p .kokoro/presubmit
-    sed -e 's/value: "integration"/value: "integration-single"/' \
-        -e 's/java8/java11/' \
-        "$SOURCE_REPO_NAME/.kokoro/presubmit/integration.cfg" > ".kokoro/presubmit/${SOURCE_REPO_NAME#java-}-integration.cfg"
-    
-    # Append BUILD_SUBDIR
-    cat <<EOF >> ".kokoro/presubmit/${SOURCE_REPO_NAME#java-}-integration.cfg"
+    for cfg_file in "$SOURCE_REPO_NAME/.kokoro/presubmit/integration"*.cfg; do
+        if [ -f "$cfg_file" ]; then
+            filename=$(basename "$cfg_file")
+            new_filename="${filename/integration/${SOURCE_REPO_NAME#java-}-integration}"
+            target_cfg=".kokoro/presubmit/${new_filename}"
+            
+            echo "Migrating and adapting $filename to $target_cfg..."
+            sed -e 's/value: "integration"/value: "integration-single"/' \
+                -e 's/java8/java11/' \
+                "$cfg_file" > "$target_cfg"
+            
+            # Append BUILD_SUBDIR
+            cat <<EOF >> "$target_cfg"
 
 env_vars: {
   key: "BUILD_SUBDIR"
   value: "${SOURCE_REPO_NAME}"
 }
 EOF
-    git add ".kokoro/presubmit/${SOURCE_REPO_NAME#java-}-integration.cfg"
-    git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): migrate Integration presubmit config"
+            git add "$target_cfg"
+        fi
+    done
+    git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): migrate Integration presubmit configurations"
+    COMMIT_COUNT=$((COMMIT_COUNT + 1))
+fi
+
+# 6.4c(2) Migrate custom conformance execution script if present
+if [ -f "$SOURCE_REPO_NAME/.kokoro/conformance.sh" ]; then
+    echo "Migrating conformance.sh to monorepo root .kokoro/${SOURCE_REPO_NAME#java-}-conformance.sh..."
+    mkdir -p .kokoro
+    cp "$SOURCE_REPO_NAME/.kokoro/conformance.sh" ".kokoro/${SOURCE_REPO_NAME#java-}-conformance.sh"
+    
+    echo "Adapting conformance script paths and build scopes for monorepo root..."
+    PL_MODULES="${SOURCE_REPO_NAME}"
+    if [ -n "${PRE_INSTALL_DEPS}" ]; then
+        PL_MODULES="${PL_MODULES},${PRE_INSTALL_DEPS}"
+    fi
+    sed -i.bak "s|mvn install|mvn install -pl ${PL_MODULES} -am|" ".kokoro/${SOURCE_REPO_NAME#java-}-conformance.sh"
+    sed -i.bak "s|cd test-proxy|cd ${SOURCE_REPO_NAME}/test-proxy|" ".kokoro/${SOURCE_REPO_NAME#java-}-conformance.sh"
+    sed -i.bak "s|-jar test-proxy/target/|-jar ${SOURCE_REPO_NAME}/test-proxy/target/|" ".kokoro/${SOURCE_REPO_NAME#java-}-conformance.sh"
+    sed -i.bak "s|kill \${proxyPID}|kill \${proxyPID} \&\& sleep 5|" ".kokoro/${SOURCE_REPO_NAME#java-}-conformance.sh"
+    sed -i.bak "s|../../test-proxy/known_failures.txt|../../\${SOURCE_REPO_NAME}/test-proxy/known_failures.txt|" ".kokoro/${SOURCE_REPO_NAME#java-}-conformance.sh"
+    rm -f ".kokoro/${SOURCE_REPO_NAME#java-}-conformance.sh.bak"
+    
+    if [ -f "${SOURCE_REPO_NAME}/test-proxy/pom.xml" ]; then
+        echo "Fixing protoc-gen-grpc-java version in test-proxy/pom.xml for Apple Silicon (osx-aarch_64) support..."
+        sed -i.bak "s|1.24.0:exe:\${os.detected.classifier}|1.62.2:exe:\${os.detected.classifier}|" "${SOURCE_REPO_NAME}/test-proxy/pom.xml"
+        rm -f "${SOURCE_REPO_NAME}/test-proxy/pom.xml.bak"
+        git add "${SOURCE_REPO_NAME}/test-proxy/pom.xml"
+        git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): fix protoc-gen-grpc-java version for Apple Silicon support"
+        COMMIT_COUNT=$((COMMIT_COUNT + 1))
+    fi
+    
+    git add ".kokoro/${SOURCE_REPO_NAME#java-}-conformance.sh"
+    git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): migrate and adapt conformance execution script"
     COMMIT_COUNT=$((COMMIT_COUNT + 1))
 fi
 

monorepo-migration/transform_workflow.py

@@ -128,6 +128,9 @@ def transform(content, lib_name):
                 line = line.replace('" >> $GITHUB_ENV', ' -P !java17" >> $GITHUB_ENV')
             if 'build.bat' in line:
                 line = line.replace('build.bat', 'build.sh')
+            if '.kokoro/conformance.sh' in line:
+                short_name = lib_name.replace('java-', '')
+                line = line.replace('.kokoro/conformance.sh', f'.kokoro/{short_name}-conformance.sh')
 
             new_lines.append(line)
     return "\n".join(new_lines)