Refactor Github Action per b/485167538

Author: benknutson-google

.github/workflows/artifacts.yaml

@@ -20,9 +20,9 @@ jobs:
         echo "x86_64_image_path=orchestration-image-x86_64-${short_sha}.tar" >> $GITHUB_ENV
         echo "image_name=cuttlefish-orchestration:${short_sha}" >> $GITHUB_ENV
     - name: Build docker image
-      run: docker/image-builder.sh -t ${{ env.image_name }}
+      run: docker/image-builder.sh -t ${IMAGE_NAME}
     - name: Save docker image
-      run: docker save --output ${{ env.x86_64_image_path }} ${{ env.image_name }}
+      run: docker save --output ${X86_64_IMAGE_PATH} ${IMAGE_NAME}
     - name: Publish docker image
       uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # aka v4.0.0
       with:
@@ -39,9 +39,9 @@ jobs:
         echo "arm64_image_path=orchestration-image-arm64-${short_sha}.tar" >> $GITHUB_ENV
         echo "image_name=cuttlefish-orchestration:${short_sha}" >> $GITHUB_ENV
     - name: Build docker image
-      run: docker/image-builder.sh -t ${{ env.image_name }}
+      run: docker/image-builder.sh -t ${IMAGE_NAME}
     - name: Save docker image
-      run: docker save --output ${{ env.arm64_image_path }} ${{ env.image_name }}
+      run: docker save --output ${ARM64_IMAGE_PATH} ${IMAGE_NAME}
     - name: Publish docker image
       uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # aka v4.0.0
       with:

.github/workflows/host-image-ci.yml

@@ -37,7 +37,9 @@ jobs:
     - name: Prepare building environment
       run: apt-get update && apt-get upgrade -y && apt-get install -y sudo wget libarchive-tools xorriso cpio xz-utils fdisk
     - name: Inject name and ID into preseed
-      run: echo "CI_PROJECT_NAME=${{ github.event.repository.name }}" >> tools/cuttlefish-host-image-installer/preseed/after_install_1.sh && echo "CI_PIPELINE_ID=${{ github.repository}}/${{ github.workflow }}" >> tools/cuttlefish-host-image-installer/preseed//after_install_1.sh
+      run: echo "CI_PROJECT_NAME=${GITHUB_EVENT_REPOSITORY_NAME}" >> tools/cuttlefish-host-image-installer/preseed/after_install_1.sh && echo "CI_PIPELINE_ID=${{ github.repository}}/${GITHUB_WORKFLOW}" >> tools/cuttlefish-host-image-installer/preseed//after_install_1.sh
+      env:
+        GITHUB_EVENT_REPOSITORY_NAME: ${{ github.event.repository.name }}
     - name: Download Debian installer
       run: cd tools/cuttlefish-host-image-installer && wget -nv -c ${DEBIAN_ISO_URL} && ./addpreseed.sh && xz -9e preseed-mini.iso
     - name: Publish preseed-mini.iso.xz

.github/workflows/presubmit.yaml

@@ -174,7 +174,7 @@ jobs:
         cat .config/cache-config.env >> $GITHUB_ENV
         echo "JOB_HASH=$(yq .jobs[\"run-cvd-unit-tests\"] .github/workflows/presubmit.yaml | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
     - name: Generate cache key prefix
-      run: echo "CACHE_KEY_PREFIX=${{ runner.os }}-${{ runner.arch }}-bazel-disk-cache-${{ env.CACHE_VERSION }}-unit-test-${{ env.JOB_HASH }}" >> $GITHUB_ENV
+      run: echo "CACHE_KEY_PREFIX=${{ runner.os }}-${{ runner.arch }}-bazel-disk-cache-${CACHE_VERSION}-unit-test-${JOB_HASH}" >> $GITHUB_ENV
     - name: Mount Bazel cache
       uses: actions/cache/restore@v4
       with:
@@ -216,7 +216,7 @@ jobs:
         cat android-cuttlefish/.config/cache-config.env >> $GITHUB_ENV
         echo "JOB_HASH=$(yq .jobs[\"build-debian-package\"] android-cuttlefish/.github/workflows/presubmit.yaml | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
     - name: Generate cache key prefix
-      run: echo "CACHE_KEY_PREFIX=${{ runner.os }}-${{ runner.arch }}-bazel-disk-cache-${{ env.CACHE_VERSION }}-debian-package-${{ env.JOB_HASH }}" >> $GITHUB_ENV
+      run: echo "CACHE_KEY_PREFIX=${{ runner.os }}-${{ runner.arch }}-bazel-disk-cache-${CACHE_VERSION}-debian-package-${JOB_HASH}" >> $GITHUB_ENV
     - name: Mount Bazel cache
       uses: actions/cache/restore@v4
       with:

.github/workflows/update-bazel-cache.yaml

@@ -27,7 +27,7 @@ jobs:
         cat .config/cache-config.env >> $GITHUB_ENV
         echo "JOB_HASH=$(yq .jobs[\"run-cvd-unit-tests\"] .github/workflows/presubmit.yaml | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
     - name: Generate cache key prefix
-      run: echo "CACHE_KEY_PREFIX=${{ runner.os }}-${{ runner.arch }}-bazel-disk-cache-${{ env.CACHE_VERSION }}-unit-test-${{ env.JOB_HASH }}" >> $GITHUB_ENV
+      run: echo "CACHE_KEY_PREFIX=${{ runner.os }}-${{ runner.arch }}-bazel-disk-cache-${CACHE_VERSION}-unit-test-${JOB_HASH}" >> $GITHUB_ENV
     - name: Mount Bazel cache
       uses: actions/cache@v4
       with:
@@ -64,7 +64,7 @@ jobs:
         cat android-cuttlefish/.config/cache-config.env >> $GITHUB_ENV
         echo "JOB_HASH=$(yq .jobs[\"build-debian-package\"] android-cuttlefish/.github/workflows/presubmit.yaml | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
     - name: Generate cache key prefix
-      run: echo "CACHE_KEY_PREFIX=${{ runner.os }}-${{ runner.arch }}-bazel-disk-cache-${{ env.CACHE_VERSION }}-debian-package-${{ env.JOB_HASH }}" >> $GITHUB_ENV
+      run: echo "CACHE_KEY_PREFIX=${{ runner.os }}-${{ runner.arch }}-bazel-disk-cache-${CACHE_VERSION}-debian-package-${JOB_HASH}" >> $GITHUB_ENV
     - name: Mount Bazel cache
       uses: actions/cache@v4
       with: