what is going on...

Opentrons · Aug 2, 2023 · 66fee44 · 66fee44
1 parent 406226e
commit 66fee44
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/build-ot3-actions.yml b/.github/workflows/build-ot3-actions.yml
@@ -112,6 +112,8 @@ jobs:
           cat <<EOF >./build/.signing-key
           ${{secrets.ROBOT_SIGNING_KEY}}
           EOF
+          ## Test
+          cat ./build/conf/local.conf
           cd ..
       - name: Pull S3 cache
         shell: bash

diff --git a/layers/meta-opentrons/recipes-images/images/opentrons-ot3-image.bb b/layers/meta-opentrons/recipes-images/images/opentrons-ot3-image.bb
@@ -291,7 +291,7 @@ do_create_opentrons_ot3() {
     # sign the hash
     signed_rootfs=""
     if [ -e "${SIGNING_KEY}" ]; then
-        bbnote "Signing the build"
+        bberror "Signing the build"
         openssl dgst -sha256 -sign "${SIGNING_KEY}" -out systemfs.xz.hash.sig systemfs.xz.sha256
         signed_rootfs="systemfs.xz.hash.sig"
     fi

diff --git a/layers/meta-opentrons/recipes-robot/opentrons-update-server/opentrons-update-server.bb b/layers/meta-opentrons/recipes-robot/opentrons-update-server/opentrons-update-server.bb
@@ -28,6 +28,9 @@ PIPENV_APP_BUNDLE_EXTRAS = ""
 PIPENV_APP_BUNDLE_USE_GLOBAL = "python3-aiohttp systemd-python"
 PIPENV_APP_BUNDLE_EXTRA_PIP_ENVARGS = "OPENTRONS_PROJECT=${OPENTRONS_PROJECT}"
 
+# Only include cert if the signing key is set
+FILES_${PN}_append := "${@bb.utils.contains('SIGNING_KEY', '', ' ${sysconfdir}/opentrons-robot-signing-key.crt ', '', d)}"
+
 do_install_append() {
   # create json file to be used in VERSION.json
   install -d ${D}/opentrons_versions
@@ -36,14 +39,13 @@ do_install_append() {
   install -d ${D}/${systemd_unitdir}/system
   install -m 0644 ${WORKDIR}/opentrons-update-server.service ${D}/${systemd_unitdir}/system
 
-  if [ -z "${SIGNING_KEY}" ]; then
-    bbnote "Installing pubkey to require signed updates"
+  bberror "FILES: ${FILES_${PN}}"
+  if [ -e "${SIGNING_KEY}" ]; then
+    bberror "Installing pubkey to require signed updates"
     install -d ${D}/${sysconfdir}
     install -m 600 ${WORKDIR}/opentrons-robot-signing-key.crt ${D}/${sysconfdir}/
   fi
 }
 
-# Only include cert if the signing key is set
-FILES_${PN}_append := "${@bb.utils.contains('SIGNING_KEY', '', ' ${sysconfdir}/opentrons-robot-signing-key.crt ', '', d)}"
 
 inherit pipenv_app_bundle