Merge pull request #882 from NebraLtd/master

Update balena.yml.linxdot-rkcm3 (#881)
NebraLtd · Sep 16, 2023 · 39c6c9c · 39c6c9c
2 parents dc97c98 + 7eb91b0
commit 39c6c9c
Show file tree

Hide file tree

Showing 13 changed files with 47 additions and 30 deletions.
diff --git a/.github/workflows/openfleet-file-update.yml b/.github/workflows/openfleet-file-update.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sbc: [hnt_openfleet_template, nebra-indoor1, nebra-outdoor1, nebra-indoor2, nebra-outdoor2, rak, pisces, og, sensecap, finestra, controllino, cotx, pantherx1, linxdot, linxdot-rkcm3, pycom, syncrobit, syncrobit-rkcm3, risinghf, midas, bobcat-px30, bobcat-rk3566]
+        sbc: [hnt_openfleet_template, nebra-indoor1, nebra-outdoor1, nebra-indoor2, nebra-outdoor2, rak, pisces, og, sensecap, finestra, controllino, cotx, pantherx1, linxdot, linxdot-rk3566, pycom, syncrobit, syncrobit-rkcm3, risinghf, midas, bobcat-px30, bobcat-rk3566]
     steps:
       - name: Generate repo name
         run: |

diff --git a/.github/workflows/push-to-prod-nebraos-cloud-draft.yml b/.github/workflows/push-to-prod-nebraos-cloud-draft.yml
@@ -10,7 +10,7 @@ jobs:
       max-parallel: 1
       fail-fast: false
       matrix:
-        sbc: [nebra-indoor1, nebra-outdoor1, nebra-indoor2, nebra-outdoor2, rak, pisces, og, sensecap, finestra, controllino, cotx, pantherx1, linxdot, linxdot-rkcm3, pycom, syncrobit, syncrobit-rkcm3, risinghf, midas, bobcat-px30, bobcat-rk3566]
+        sbc: [nebra-indoor1, nebra-outdoor1, nebra-indoor2, nebra-outdoor2, rak, pisces, og, sensecap, finestra, controllino, cotx, pantherx1, linxdot, linxdot-rk3566, pycom, syncrobit, syncrobit-rkcm3, risinghf, midas, bobcat-px30, bobcat-rk3566]
 
     steps:
       - name: Checkout
@@ -59,7 +59,7 @@ jobs:
           python gen_docker_compose_by_variant.py "$variant" -o docker-compose.yml
 
       - name: Balena Deploy
-        uses: nebraltd/balena-cli-action@v16.7.6
+        uses: nebraltd/balena-cli-action@v17.1.1
         with:
           balena_api_token: ${{secrets.NEBRAOS_CLOUD_TOKEN}}
           balena_url: cloud.nebra.com

diff --git a/.github/workflows/push-to-prod-nebraos-cloud.yml b/.github/workflows/push-to-prod-nebraos-cloud.yml
@@ -16,7 +16,7 @@ jobs:
       max-parallel: 1
       fail-fast: false
       matrix:
-        sbc: [nebra-indoor1, nebra-outdoor1, nebra-indoor2, nebra-outdoor2, rak, pisces, og, sensecap, finestra, controllino, cotx, pantherx1, linxdot, linxdot-rkcm3, pycom, syncrobit, syncrobit-rkcm3, risinghf, midas, bobcat-px30, bobcat-rk3566]
+        sbc: [nebra-indoor1, nebra-outdoor1, nebra-indoor2, nebra-outdoor2, rak, pisces, og, sensecap, finestra, controllino, cotx, pantherx1, linxdot, linxdot-rk3566, pycom, syncrobit, syncrobit-rkcm3, risinghf, midas, bobcat-px30, bobcat-rk3566]
 
     steps:
       - name: Checkout
@@ -65,7 +65,7 @@ jobs:
           python gen_docker_compose_by_variant.py "$variant" -o docker-compose.yml
 
       - name: Balena Deploy
-        uses: nebraltd/balena-cli-action@v16.7.6
+        uses: nebraltd/balena-cli-action@v17.1.1
         with:
           balena_api_token: ${{secrets.NEBRAOS_CLOUD_TOKEN}}
           balena_url: cloud.nebra.com

diff --git a/.github/workflows/push-to-testnet-nebraos-cloud-draft.yml b/.github/workflows/push-to-testnet-nebraos-cloud-draft.yml
@@ -10,7 +10,7 @@ jobs:
       max-parallel: 1
       fail-fast: false
       matrix:
-        sbc: [raspi, rockpi, rak, finestra, sensecap, og, controllino, pisces, cotx, pantherx1, linxdot, linxdot-rkcm3, syncrobit, syncrobit-rkcm3, pycom, risinghf, midas, bobcat-px30, bobcat-rk3566]
+        sbc: [raspi, rockpi, rak, finestra, sensecap, og, controllino, pisces, cotx, pantherx1, linxdot, linxdot-rk3566, syncrobit, syncrobit-rkcm3, pycom, risinghf, midas, bobcat-px30, bobcat-rk3566]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -83,7 +83,7 @@ jobs:
           fi
 
       - name: Balena Deploy
-        uses: nebraltd/balena-cli-action@v16.7.6
+        uses: nebraltd/balena-cli-action@v17.1.1
         with:
           balena_api_token: ${{secrets.NEBRAOS_CLOUD_TOKEN}}
           balena_url: cloud.nebra.com

diff --git a/.github/workflows/push-to-testnet-nebraos-cloud.yml b/.github/workflows/push-to-testnet-nebraos-cloud.yml
@@ -16,7 +16,7 @@ jobs:
       max-parallel: 1
       fail-fast: false
       matrix:
-        sbc: [raspi, rockpi, rak, finestra, sensecap, og, controllino, pisces, cotx, pantherx1, linxdot, linxdot-rkcm3, syncrobit, syncrobit-rkcm3, pycom, risinghf, midas, bobcat-px30, bobcat-rk3566]
+        sbc: [raspi, rockpi, rak, finestra, sensecap, og, controllino, pisces, cotx, pantherx1, linxdot, linxdot-rk3566, syncrobit, syncrobit-rkcm3, pycom, risinghf, midas, bobcat-px30, bobcat-rk3566]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -89,7 +89,7 @@ jobs:
           fi
 
       - name: Balena Deploy
-        uses: nebraltd/balena-cli-action@v16.7.6
+        uses: nebraltd/balena-cli-action@v17.1.1
         with:
           balena_api_token: ${{secrets.NEBRAOS_CLOUD_TOKEN}}
           balena_url: cloud.nebra.com

diff --git a/balena/balena.yml.linxdot-rkcm3 → balena/balena.yml.linxdot-rk3566 b/balena/balena.yml.linxdot-rkcm3 → balena/balena.yml.linxdot-rk3566
@@ -1,23 +1,23 @@
-name: nebra-helium-linxdot-rkcm3
+name: nebra-helium-linxdot-rk3566
 type: sw.application
 description: >-
-  Manage your Linxdot ROCK CM3 Helium Miner remotely using Nebra and balenaCloud.
+  Manage your Linxdot RK3566 Helium Miner remotely using Nebra and balenaCloud.
 post-provisioning: >-
   ## Usage instructions
 
 
   Once your device joins the fleet you'll need to allow some time for it to download the application and start forwarding packets to the Helium Network.
 
 
-  For detailed instructions on how to use Nebra Helium Linxdot ROCK CM3 check out [our GitHub repo](https://github.com/NebraLtd/helium-linxdot-rkcm3).
+  For detailed instructions on how to use Nebra Helium Linxdot RK3566 check out [our GitHub repo](https://github.com/NebraLtd/helium-linxdot-rk3566).
 
 
-  For support you can [open an issue](https://github.com/NebraLtd/helium-linxdot-rkcm3/issues) on the repo or reach out to us via one of the methods listed [on our support page](https://helium.nebra.com).
+  For support you can [open an issue](https://github.com/NebraLtd/helium-linxdot-rk3566/issues) on the repo or reach out to us via one of the methods listed [on our support page](https://helium.nebra.com).
 assets:
   repository:
     type: blob.asset
     data:
-      url: "https://github.com/NebraLtd/helium-linxdot-rkcm3"
+      url: "https://github.com/NebraLtd/helium-linxdot-rk3566"
   logo:
     type: blob.asset
     data:
@@ -26,10 +26,10 @@ assets:
 data:
   applicationEnvironmentVariables:
     - FREQ: "N/A (Non Nebra Miner)"
-    - VARIANT: COMP-LINXDOTRKCM3
+    - VARIANT: COMP-LINXDOTRK3566
   applicationConfigVariables:
     - RESIN_OVERRIDE_LOCK: 1
-  defaultDeviceType: rockpicm3-ioboard
+  defaultDeviceType: linxdot-rk3566
   supportedDeviceTypes:
-    - rockpicm3-ioboard
+    - nanopc-t4
 version: 0.0.1
diff --git a/balena/workflows/balena-app.yml b/balena/workflows/balena-app.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Random sleep (balena API workaround)
         run:  sleep $[ ( $RANDOM % 600 ) + 1 ]s
       - name: Balena Deploy
-        uses: nebraltd/balena-cli-action@v16.7.6
+        uses: nebraltd/balena-cli-action@v17.1.1
         with:
           balena_api_token: ${{secrets.BALENA_API_TOKEN}}
           balena_command: "deploy nebraltd/helium-${{ env.miner }}-app --debug --nocache --build"
diff --git a/balena/workflows/build-open-fleet.yml b/balena/workflows/build-open-fleet.yml
@@ -6,15 +6,17 @@ on:
   workflow_dispatch:
 
 env:
-  balena-cli: v16.7.6
-  raspberrypi3-64: 3.1.12
-  raspberrypi4-64: 3.1.12
+  balena-cli: v17.1.1
+  raspberrypi3-64: 4.0.7
+  raspberrypi4-64: 4.0.7
   raspberrypicm4-ioboard: 2.112.12
   rockpi-4b-rk3399: 2.108.25+rev1
   balena-bobcat-px30-image: 2023.07.17
   bobcat-px30: 2.115.3
   balena-bobcat-rk3566-image: 2023.08.15
   bobcat-rk3566: 2.115.3
+  balena-linxdot-rk3566-image: 2023.08.15
+  linxdot-rk3566: 2.115.3
   cloud: nebra-cloud
 
 jobs:
@@ -155,6 +157,16 @@ jobs:
           target: 'images/balena-base-${{ github.event.repository.name }}.img.zip'
           token: ${{ secrets.MR_BUMP }}
 
+      - name: Download Linxdot RK3566 base Balena OS image
+        uses: dsaltares/fetch-gh-release-asset@master
+        if: github.event.repository.name == 'helium-linxdot-rk3566' && env.BRANCH == 'master'
+        with:
+          repo: 'NebraLtd/balena-linxdot-rk3566'
+          version: 'tags/${{ env.balena-linxdot-rk3566-image }}'
+          file: 'balena-image-linxdot-rk3566-${{ env.balena-linxdot-rk3566-image }}.img.zip'
+          target: 'images/balena-base-${{ github.event.repository.name }}.img.zip'
+          token: ${{ secrets.MR_BUMP }}
+
       - name: Generate a Balena OS image for the given board, variant, frequency
         if: env.BRANCH == 'master'
         run: |
@@ -204,6 +216,9 @@ jobs:
           elif [ ${{ github.event.repository.name }} == 'helium-bobcat-rk3566' ] ; then
             balena_os="rockpro64"
             balena_os_version="${{ env.bobcat-rk3566 }}"
+          elif [ ${{ github.event.repository.name }} == 'helium-linxdot-rk3566' ] ; then
+            balena_os="nanopc-t4"
+            balena_os_version="${{ env.linxdot-rk3566 }}"
           elif [ ${{ env.ROCKPI }} == 'YES' ] ; then
             balena_os="rockpi-4b-rk3399"
             balena_os_version="${{ env.rockpi-4b-rk3399 }}"
@@ -219,7 +234,7 @@ jobs:
           fi
 
           if $NODRYRUN ; then
-            if [ ${{ github.event.repository.name }} != 'helium-bobcat-px30' ] && [ ${{ github.event.repository.name }} != 'helium-bobcat-rk3566' ]; then
+            if [ ${{ github.event.repository.name }} != 'helium-bobcat-px30' ] && [ ${{ github.event.repository.name }} != 'helium-bobcat-rk3566' ] && [ ${{ github.event.repository.name }} != 'helium-linxdot-rk3566' ]; then
               # Download the base image
               balena os download "$balena_os" \
                 -o "$base_image_path" \
@@ -281,7 +296,7 @@ jobs:
           fi
 
           if $NODRYRUN ; then
-            if  [ ${{ github.event.repository.name }} != 'helium-bobcat-px30' ] && [ ${{ github.event.repository.name }} != 'helium-bobcat-rk3566' ]; then
+            if  [ ${{ github.event.repository.name }} != 'helium-bobcat-px30' ] && [ ${{ github.event.repository.name }} != 'helium-bobcat-rk3566' ] && [ ${{ github.event.repository.name }} != 'helium-linxdot-rk3566' ]; then
               balena os configure "$image_path" \
                 --fleet "nebraltd/$fleet_name" \
                 --config-network ethernet \
@@ -315,7 +330,7 @@ jobs:
             sudo balena config inject $final_json_filename --drive "$image_path"
           fi
 
-          if  [ ${{ github.event.repository.name }} == 'helium-bobcat-px30' ] || [ ${{ github.event.repository.name }} == 'helium-bobcat-rk3566' ]; then
+          if  [ ${{ github.event.repository.name }} == 'helium-bobcat-px30' ] || [ ${{ github.event.repository.name }} == 'helium-bobcat-rk3566' ] || [ ${{ github.event.repository.name }} == 'helium-linxdot-rk3566' ]; then
             # Overwrite device type from bobcat specific to balena specific
             if $VERBOSE ; then
               echo "Overwriting device-type"
@@ -331,6 +346,8 @@ jobs:
                 sudo sed -i 's/"slug": "bobcat-px30"/"slug": "isg-503"/' ${tmpdir}/device-type.json
               elif [ ${{ github.event.repository.name }} == 'helium-bobcat-rk3566' ]; then
                 sudo sed -i 's/"slug": "bobcat-rk3566"/"slug": "rockpro64"/' ${tmpdir}/device-type.json
+              elif [ ${{ github.event.repository.name }} == 'helium-linxdot-rk3566' ]; then
+                sudo sed -i 's/"slug": "linxdot-rk3566"/"slug": "nanopc-t4"/' ${tmpdir}/device-type.json
               fi
 
               sudo umount ${tmpdir}

diff --git a/balena/workflows/update-action-prod.yml b/balena/workflows/update-action-prod.yml
@@ -59,7 +59,7 @@ jobs:
 
       - name: Balena Deploy
         if: env.LATEST == 'FALSE'
-        uses: nebraltd/balena-cli-action@v16.7.6
+        uses: nebraltd/balena-cli-action@v17.1.1
         with:
           balena_api_token: ${{secrets.BALENA_API_TOKEN}}
           balena_command: "deploy ${{ env.fleet }} --debug --nocache --build"

diff --git a/balena/workflows/update-action-test.yml b/balena/workflows/update-action-test.yml
@@ -59,7 +59,7 @@ jobs:
 
       - name: Balena Deploy
         if: env.LATEST == 'FALSE'
-        uses: nebraltd/balena-cli-action@v16.7.6
+        uses: nebraltd/balena-cli-action@v17.1.1
         with:
           balena_api_token: ${{secrets.BALENA_API_TOKEN}}
           balena_command: "deploy ${{ env.fleet }} --debug --nocache --build"

diff --git a/balena/workflows/update-files.yml b/balena/workflows/update-files.yml
@@ -46,7 +46,7 @@ jobs:
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/production/balena/config/config.txt.syncrobit -O config.txt
           elif [ $miner == 'risinghf' ] ; then
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/production/balena/config/config.txt.risinghf -O config.txt
-          elif [ $miner == 'nebra-indoor2' ] || [ $miner == 'nebra-outdoor2' ] || [ $miner == 'linxdot-rkcm3' ] || [ $miner == 'syncrobit-rkcm3' ] || [ $miner == 'bobcat-px30' ] || [ $miner == 'bobcat-rk3566' ] ; then
+          elif [ $miner == 'nebra-indoor2' ] || [ $miner == 'nebra-outdoor2' ] || [ $miner == 'linxdot-rk3566' ] || [ $miner == 'syncrobit-rkcm3' ] || [ $miner == 'bobcat-px30' ] || [ $miner == 'bobcat-rk3566' ] ; then
             echo "No config.txt file needed - not RasPi based."
           else
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/production/balena/config/config.txt.rak -O config.txt
@@ -105,7 +105,7 @@ jobs:
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/master/balena/config/config.txt.syncrobit -O config.txt
           elif [ $miner == 'risinghf' ] ; then
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/master/balena/config/config.txt.risinghf -O config.txt
-          elif [ $miner == 'nebra-indoor2' ] || [ $miner == 'nebra-outdoor2' ] || [ $miner == 'linxdot-rkcm3' ] || [ $miner == 'syncrobit-rkcm3' ] || [ $miner == 'bobcat-px30' ] || [ $miner == 'bobcat-rk3566' ] ; then
+          elif [ $miner == 'nebra-indoor2' ] || [ $miner == 'nebra-outdoor2' ] || [ $miner == 'linxdot-rk3566' ] || [ $miner == 'syncrobit-rkcm3' ] || [ $miner == 'bobcat-px30' ] || [ $miner == 'bobcat-rk3566' ] ; then
             echo "No config.txt file needed - not RasPi based."
           else
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/master/balena/config/config.txt.rak -O config.txt

diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
 jinja2==3.1.2
 grpcio==1.56.0
-hm-pyhelper==0.14.25
+hm-pyhelper==0.14.30
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -3,4 +3,4 @@ bandit==1.7.5
 pytest==7.4.0
 pytest-cov==4.1.0
 grpcio==1.56.0
-hm_pyhelper==0.14.22
+hm_pyhelper==0.14.30