Skip to content

Commit

Permalink
Commit to build envs in manifest for OS
Browse files Browse the repository at this point in the history
Moved the instantiation of the fake implementation envs into the cloudbuild file instead of being hidden in docker. Without doing this, we can't commit to the same values that are passed to the Makefile.
  • Loading branch information
mhutchinson committed Feb 13, 2024
1 parent 21f1779 commit 34cabee
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ ARG APPLET_PUBLIC_KEY
ARG OS_PUBLIC_KEY1
ARG OS_PUBLIC_KEY2
ARG GIT_SEMVER_TAG
# Build environment variables. In addition to routing these through to the make
# command, they MUST also be committed to in the manifest.
ARG BEE
ARG DEBUG

Expand Down
4 changes: 4 additions & 0 deletions release/cloudbuild_ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ steps:
--firmware_file=output/trusted_os.elf \
--firmware_type=TRUSTED_OS \
--tamago_version=${_TAMAGO_VERSION} \
--build_env="BEE=${_BEE}" \
--build_env="DEBUG=${_DEBUG}" \
--raw \
--output_file=output/trusted_os_manifest_unsigned.json
# Sign the log entry.
Expand Down Expand Up @@ -175,4 +177,6 @@ substitutions:
_OS_PUBLIC_KEY2: transparency.dev-aw-os2-ci+af8e4114+AbBJk5MgxRB+68KhGojhUdSt1ts5GAdRIT1Eq9zEkgQh
_BEE: '1'
_DEBUG: '1'
_FAKE_RPMB: '1'
_FAKE_STORAGE: '0'
_CHECKPOINT_CACHE: 'public, max-age=30'

0 comments on commit 34cabee

Please sign in to comment.