Change WearOS Kokoro config to a separate job #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

riggaroo merged 5 commits into main from revert-124-wear-os-release

Sep 12, 2025

build_presubmit.sh → build_presubmit_mobile.sh

-Original file line number
+Diff line change
@@ Expand Up / @@ -98,9 +98,6 @@ echo "INFO: Cleaning the project..." @@
     echo "INFO: Building the Android production release bundle..."
     ./gradlew app:bundleRelease app:spdxSbomForRelease -x test -x uploadCrashlyticsMappingFileRelease -Pandroid.sdk.path=$ANDROID_HOME -PCI_BUILD=true
-    echo "INFO: Building the Wear OS production release bundle..."
-    ./gradlew wear:bundleRelease -x test -x uploadCrashlyticsMappingFileRelease -Pandroid.sdk.path=$ANDROID_HOME -PCI_BUILD=true
     # --- Artifact Collection ---
     echo "INFO: Preparing artifacts for Kokoro..."
@@ Expand Down Expand Up @@
     echo "INFO: Copying SPDX SBOM..."
     cp app/build/spdx/release.spdx.json "${KOKORO_ARTIFACTS_DIR}/artifacts/app-release.spdx.json"
-    # Collect the Wear OS application artifacts
-    collect_artifacts "wear/build/outputs/bundle/release" "wear-release.aab" "wear-release-unsigned.aab"
     exit 0

build_presubmit_wear.sh

-Original file line number
+Diff line change
@@ -0,0 +1,134 @@
+    #!/usr/bin/env bash
+    #
+    # Copyright 2025 The Android Open Source Project
+    #
+    #   Licensed under the Apache License, Version 2.0 (the "License");
+    #   you may not use this file except in compliance with the License.
+    #   You may obtain a copy of the License at
+    #
+    #       https://www.apache.org/licenses/LICENSE-2.0
+    #
+    #   Unless required by applicable law or agreed to in writing, software
+    #   distributed under the License is distributed on an "AS IS" BASIS,
+    #   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    #   See the License for the specific language governing permissions and
+    #   limitations under the License.
+    #
+    # IGNORE this file, it's only used in the internal Google release process
+    # Fail on any error to ensure the script stops if a step fails.
+    set -e
+    # --- Configuration ---
+    # Get the script's directory.
+    DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+    echo DIR
+    # Define the Android SDK version you want to target.
+    ANDROID_SDK_VERSION="36"
+    ANDROID_BUILD_TOOLS_VERSION="36.0.0"
+    # Switched from 'google_apis' to 'google_atd' (Google Automated Test Device).
+    # This system image is designed for headless, automated testing in CI environments
+    # and is more compatible with software rendering. It will be installed but may not
+    # be used by the new build command.
+    # 36 not available yet as per b/432143095
+    EMULATOR_IMAGE="system-images;android-35;google_atd;x86_64"
+    # --- Environment Setup ---
+    # Step 1: Check for essential command-line tools.
+    echo "INFO: Checking for prerequisites (wget, unzip, tar)..."
+    for cmd in wget unzip tar; do
+      if ! command -v $cmd &> /dev/null; then
+        echo "ERROR: Command '$cmd' not found. Please install it using your system's package manager (e.g., 'sudo apt-get install $cmd') and try again."
+        exit 1
+      fi
+    done
+    echo "INFO: Prerequisites are installed."
+    # Step 2: Install and configure Java 17 system-wide.
+    echo "INFO: Setting up Java 17..."
+    # The build needs Java 17, set it as the default Java version.
+    sudo apt-get update
+    sudo apt-get install -y openjdk-17-jdk
+    sudo update-alternatives --set java /usr/lib/jvm/java-17-openjdk-amd64/bin/java
+    java -version
+    # Also clear JAVA_HOME variable so java -version is used instead
+    export JAVA_HOME=
+    # Add the local SDK and emulator tools to the PATH for this session.
+    # The system-wide Java will already be in the PATH.
+    export PATH="$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/emulator"
+    echo "INFO: Local tools added to PATH."
+    # Now, accept licenses and install packages.
+    # It's best practice to accept licenses *after* the tools are in place.
+    echo "INFO: Accepting all pending SDK licenses..."
+    yes | sdkmanager --licenses
+    echo "INFO: Installing Android SDK packages, including emulator and system image..."
+    # This single command will install/update all necessary packages.
+    sdkmanager "platforms;android-${ANDROID_SDK_VERSION}" "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" "platform-tools" "${EMULATOR_IMAGE}" "emulator"
+    # Run license acceptance AGAIN after installing new packages. This is crucial.
+    echo "INFO: Accepting licenses for newly installed packages..."
+    yes | sdkmanager --licenses
+    echo "Copying google-services.json"
+    cp /tmpfs/src/git/androidify-prebuilts/google-services.json ${DIR}/app
+    echo "Copying gradle.properties"
+    echo "" >> ${DIR}/gradle.properties # add a new line to the file
+    cat /tmpfs/src/git/androidify-prebuilts/gradle.properties >> ${DIR}/gradle.properties
+    ls
+    # --- Build Process ---
+    # This script assembles the release build of the Android application.
+    # Ensure gradlew is executable
+    chmod +x ./gradlew
+    # Clean the project (optional, but good for a fresh release build)
+    echo "INFO: Cleaning the project..."
+    ./gradlew clean -Pandroid.sdk.path=$ANDROID_HOME
+    echo "INFO: Building the Wear OS production release bundle..."
+    ./gradlew wear:bundleRelease -x test -x uploadCrashlyticsMappingFileRelease -Pandroid.sdk.path=$ANDROID_HOME -PCI_BUILD=true
+    # --- Artifact Collection ---
+    echo "INFO: Preparing artifacts for Kokoro..."
+    # This function collects a specific AAB and its associated in-toto files.
+    # Arguments:
+    #   $1: Source directory for the AAB (e.g., "app/build/outputs/bundle/release")
+    #   $2: Source filename for the AAB (e.g., "app-release.aab")
+    #   $3: Destination filename for the AAB (e.g., "app-release-unsigned.aab")
+    collect_artifacts() {
+      local aab_src_dir="$1"
+      local aab_file="$2"
+      local aab_dest_file="$3"
+      local aab_path="${aab_src_dir}/${aab_file}"
+      # Check if the AAB exists
+      if [[ -f "$aab_path" ]]; then
+        # Create a directory within Kokoro's artifact collection area
+        local artifact_dest_dir="${KOKORO_ARTIFACTS_DIR}/artifacts"
+        mkdir -p "${artifact_dest_dir}"
+        # Copy the AAB
+        cp "${aab_path}" "${artifact_dest_dir}/${aab_dest_file}"
+        echo "SUCCESS: AAB copied to ${artifact_dest_dir}"
+      else
+        echo "FAILURE: AAB not found at ${aab_path}"
+        exit 1
+      fi
+    }
+    # Collect the Wear OS application artifacts
+    collect_artifacts "wear/build/outputs/bundle/release" "wear-release.aab" "wear-release-unsigned.aab"
+    exit 0

build.sh → build_release_mobile.sh

-Original file line number
+Diff line change
@@ Expand Up / @@ -96,9 +96,6 @@ echo "INFO: Cleaning the project..." @@
     echo "INFO: Building the Android production release bundle..."
     ./gradlew app:bundleRelease app:spdxSbomForRelease -x test -Pandroid.sdk.path=$ANDROID_HOME -PCI_BUILD=true
-    echo "INFO: Building the Wear OS production release bundle..."
-    ./gradlew wear:bundleRelease -x test -Pandroid.sdk.path=$ANDROID_HOME -PCI_BUILD=true
     # --- Artifact Collection ---
     echo "INFO: Preparing artifacts for Kokoro..."
@@ Expand Down Expand Up @@
     echo "INFO: Copying SPDX SBOM..."
     cp app/build/spdx/release.spdx.json "${KOKORO_ARTIFACTS_DIR}/artifacts/app-release.spdx.json"
-    # Collect the Wear OS application artifacts
-    collect_artifacts "wear/build/outputs/bundle/release" "wear-release.aab" "wear-release-unsigned.aab"
     exit 0

build_release_wear.sh

-Original file line number
+Diff line change
@@ -0,0 +1,131 @@
+    #!/usr/bin/env bash
+    #
+    # Copyright 2025 The Android Open Source Project
+    #
+    #   Licensed under the Apache License, Version 2.0 (the "License");
+    #   you may not use this file except in compliance with the License.
+    #   You may obtain a copy of the License at
+    #
+    #       https://www.apache.org/licenses/LICENSE-2.0
+    #
+    #   Unless required by applicable law or agreed to in writing, software
+    #   distributed under the License is distributed on an "AS IS" BASIS,
+    #   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    #   See the License for the specific language governing permissions and
+    #   limitations under the License.
+    #
+    # IGNORE this file, it's only used in the internal Google release process
+    # Fail on any error to ensure the script stops if a step fails.
+    set -e
+    # --- Configuration ---
+    # Get the script's directory.
+    DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+    # Define the Android SDK version you want to target.
+    ANDROID_SDK_VERSION="36"
+    ANDROID_BUILD_TOOLS_VERSION="36.0.0"
+    # Switched from 'google_apis' to 'google_atd' (Google Automated Test Device).
+    # This system image is designed for headless, automated testing in CI environments
+    # and is more compatible with software rendering. It will be installed but may not
+    # be used by the new build command.
+    # 36 not available yet as per b/432143095
+    EMULATOR_IMAGE="system-images;android-35;google_atd;x86_64"
+    # --- Environment Setup ---
+    # Step 1: Check for essential command-line tools.
+    echo "INFO: Checking for prerequisites (wget, unzip, tar)..."
+    for cmd in wget unzip tar; do
+      if ! command -v $cmd &> /dev/null; then
+        echo "ERROR: Command '$cmd' not found. Please install it using your system's package manager (e.g., 'sudo apt-get install $cmd') and try again."
+        exit 1
+      fi
+    done
+    echo "INFO: Prerequisites are installed."
+    # Step 2: Install and configure Java 17 system-wide.
+    echo "INFO: Setting up Java 17..."
+    # The build needs Java 17, set it as the default Java version.
+    sudo apt-get update
+    sudo apt-get install -y openjdk-17-jdk
+    sudo update-alternatives --set java /usr/lib/jvm/java-17-openjdk-amd64/bin/java
+    java -version
+    # Also clear JAVA_HOME variable so java -version is used instead
+    export JAVA_HOME=
+    # Add the local SDK and emulator tools to the PATH for this session.
+    # The system-wide Java will already be in the PATH.
+    export PATH="$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/emulator"
+    echo "INFO: Local tools added to PATH."
+    # Now, accept licenses and install packages.
+    # It's best practice to accept licenses *after* the tools are in place.
+    echo "INFO: Accepting all pending SDK licenses..."
+    yes | sdkmanager --licenses
+    echo "INFO: Installing Android SDK packages, including emulator and system image..."
+    # This single command will install/update all necessary packages.
+    sdkmanager "platforms;android-${ANDROID_SDK_VERSION}" "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" "platform-tools" "${EMULATOR_IMAGE}" "emulator"
+    # Run license acceptance AGAIN after installing new packages. This is crucial.
+    echo "INFO: Accepting licenses for newly installed packages..."
+    yes | sdkmanager --licenses
+    echo "Copying google-services.json"
+    cp /tmpfs/src/git/androidify-prebuilts/google-services.json ${DIR}/app
+    echo "Copying gradle.properties"
+    echo "" >> ${DIR}/gradle.properties # add a new line to the file
+    cat /tmpfs/src/git/androidify-prebuilts/gradle.properties >> ${DIR}/gradle.properties
+    # --- Build Process ---
+    # This script assembles the release build of the Android application.
+    # Ensure gradlew is executable
+    chmod +x ./gradlew
+    # Clean the project (optional, but good for a fresh release build)
+    echo "INFO: Cleaning the project..."
+    ./gradlew clean -Pandroid.sdk.path=$ANDROID_HOME
+    echo "INFO: Building the Wear OS production release bundle..."
+    ./gradlew wear:bundleRelease -x test -Pandroid.sdk.path=$ANDROID_HOME -PCI_BUILD=true
+    # --- Artifact Collection ---
+    echo "INFO: Preparing artifacts for Kokoro..."
+    # This function collects a specific AAB and its associated in-toto files.
+    # Arguments:
+    #   $1: Source directory for the AAB (e.g., "app/build/outputs/bundle/release")
+    #   $2: Source filename for the AAB (e.g., "app-release.aab")
+    #   $3: Destination filename for the AAB (e.g., "app-release-unsigned.aab")
+    collect_artifacts() {
+      local aab_src_dir="$1"
+      local aab_file="$2"
+      local aab_dest_file="$3"
+      local aab_path="${aab_src_dir}/${aab_file}"
+      # Check if the AAB exists
+      if [[ -f "$aab_path" ]]; then
+        # Create a directory within Kokoro's artifact collection area
+        local artifact_dest_dir="${KOKORO_ARTIFACTS_DIR}/artifacts"
+        mkdir -p "${artifact_dest_dir}"
+        # Copy the AAB
+        cp "${aab_path}" "${artifact_dest_dir}/${aab_dest_file}"
+        echo "SUCCESS: AAB copied to ${artifact_dest_dir}"
+      else
+        echo "FAILURE: AAB not found at ${aab_path}"
+        exit 1
+      fi
+    }
+    # Collect the Wear OS application artifacts
+    collect_artifacts "wear/build/outputs/bundle/release" "wear-release.aab" "wear-release-unsigned.aab"
+    exit 0

gradle/libs.versions.toml

-Original file line number
+Diff line change
@@ -1,7 +1,7 @@
     [versions]
     # build
     appVersionCode = "7"
-    appVersionName = "1.1.5"
+    appVersionName = "1.2.0"
     agp = "8.11.1"
     bcpkixJdk18on = "1.81"
     compileSdk = "36"
@@ Expand Down @@

kokoro/gcp_ubuntu_docker/continuous.cfg

-Original file line number
+Diff line change
@@ -1,27 +1,12 @@
     build_file: "androidify/kokoro/gcp_ubuntu_docker/kokoro_build.sh"
-    fileset_artifacts {
-      name: "androidify_phone_aab"
-      artifact_globs: "artifacts/app-release-unsigned.aab"
-      artifact_globs: "artifacts/app-release.spdx.json"
-      destinations {
-        store_attestation: true
-        gcs {
-          gcs_root_path: "androidify-app-prod-kokoro-artifacts/gcp_ubuntu_docker/continuous/mobile"
-        }
+    action {
+      define_artifacts {
+        regex: "artifacts/**.aab"
+        regex: "artifacts/**.intoto.jsonl"
+        sbom_regex: "artifacts/app-release.spdx.json"
+        # Optional: Removes the "artifacts/" part from the path in the artifact storage
+        strip_prefix: "artifacts"
+        fail_if_no_artifacts: true
       }
     }
-    # Fileset for the Wear OS App AAB
-    fileset_artifacts {
-      name: "androidify_wear_aab"
-      artifact_globs: "artifacts/wear-release-unsigned.aab"
-      destinations {
-        store_attestation: true
-        gcs {
-          gcs_root_path: "androidify-app-prod-kokoro-artifacts/gcp_ubuntu_docker/continuous/wear"
-        }
-      }
-    }

kokoro/gcp_ubuntu_docker/kokoro_build_mobile_presubmit.sh

-Original file line number
+Diff line change
@@ -0,0 +1,19 @@
+    #!/bin/bash
+    # Fail on any error.
+    set -e
+    # Display commands being run.
+    # WARNING: please only enable 'set -x' if necessary for debugging, and be very
+    #  careful if you handle credentials (e.g. from Keystore) with 'set -x':
+    #  statements like "export VAR=$(cat /tmp/keystore/credentials)" will result in
+    #  the credentials being printed in build logs.
+    #  Additionally, recursive invocation with credentials as command-line
+    #  parameters, will print the full command, with credentials, in the build logs.
+    # set -x
+    # Code under repo is checked out to ${KOKORO_ARTIFACTS_DIR}/github.
+    # The final directory name in this path is determined by the scm name specified
+    # in the job configuration.
+    cd "${KOKORO_ARTIFACTS_DIR}/github/androidify"
+    ./build_presubmit_mobile.sh

...p_ubuntu_docker/kokoro_presubmit_build.sh → ...ntu_docker/kokoro_build_mobile_release.sh

100644 → 100755

-Original file line number
+Diff line change
@@ Expand Up / @@ -16,4 +16,4 @@ set -e @@
     # The final directory name in this path is determined by the scm name specified
     # in the job configuration.
     cd "${KOKORO_ARTIFACTS_DIR}/github/androidify"
-    ./build_presubmit.sh
+    ./build_release_mobile.sh

kokoro/gcp_ubuntu_docker/kokoro_build_wear_presubmit.sh

-Original file line number
+Diff line change
@@ -0,0 +1,19 @@
+    #!/bin/bash
+    # Fail on any error.
+    set -e
+    # Display commands being run.
+    # WARNING: please only enable 'set -x' if necessary for debugging, and be very
+    #  careful if you handle credentials (e.g. from Keystore) with 'set -x':
+    #  statements like "export VAR=$(cat /tmp/keystore/credentials)" will result in
+    #  the credentials being printed in build logs.
+    #  Additionally, recursive invocation with credentials as command-line
+    #  parameters, will print the full command, with credentials, in the build logs.
+    # set -x
+    # Code under repo is checked out to ${KOKORO_ARTIFACTS_DIR}/github.
+    # The final directory name in this path is determined by the scm name specified
+    # in the job configuration.
+    cd "${KOKORO_ARTIFACTS_DIR}/github/androidify"
+    ./build_presubmit_wear.sh

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Change WearOS Kokoro config to a separate job #125

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!