Skip to content
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

release(prod): 2021.11.11.0-1, ECC concurrency, initFile robustness, and pktfwd rewrite #215

Merged
merged 24 commits into from
Nov 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
a0b4e52
test diag with new base image
shawaj Oct 23, 2021
6c71285
bump upnp for testing
shawaj Oct 23, 2021
5b042f2
fix: add depends on for packet forwarder
shawaj Oct 24, 2021
2eca2c9
Merge pull request #185 from NebraLtd/shawaj/waitforminer
shawaj Oct 26, 2021
06abcb7
Create docker-compose.yml
shawaj Oct 27, 2021
f1e275e
Bump to 2021.10.27.0_GA
shawaj Oct 27, 2021
a2cd325
Added documentation to the readme for quick start (#189)
Oct 29, 2021
06dcde3
Bump to 2021.10.29.0_GA
shawaj Oct 30, 2021
2193dc3
Bump to 2021.11.02.0_GA
shawaj Nov 4, 2021
b1a1710
rearrange readme
shawaj Nov 4, 2021
c3a1f31
Update README.md
shawaj Nov 4, 2021
11a539b
Bump diag and config
shawaj Nov 5, 2021
175e06f
feat: bump GA to 2021.11.04.2
marvinmarnold Nov 8, 2021
c5a299d
Merge pull request #195 from NebraLtd/marvinmarnold/193/GA-2021-11-04-2
marvinmarnold Nov 8, 2021
ec34b65
release: bump GA to 2021.11.10.0
marvinmarnold Nov 11, 2021
64ef524
Merge pull request #205 from NebraLtd/marvinmarnold/testnet/GA-2021-1…
marvinmarnold Nov 11, 2021
4a5b2eb
release: bump GA to 2021.11.11.0
marvinmarnold Nov 12, 2021
8394e47
Merge pull request #211 from NebraLtd/marvinmarnold/testnet/GA-2021-1…
marvinmarnold Nov 12, 2021
5973e3e
Add tech support to CODEOWNERS
shawaj Nov 12, 2021
2bcf89e
fix: ECC locking and initFile (#209)
marvinmarnold Nov 12, 2021
10dd378
Merge pull request #213 from NebraLtd/shawaj/CODEOWNERS
shawaj Nov 12, 2021
0a3f8f8
build: bump firmware version
marvinmarnold Nov 12, 2021
41f8ed7
Merge remote-tracking branch 'origin/production' into marvinmarnold/p…
marvinmarnold Nov 12, 2021
504a3e7
bump(pktfwd): current master branch
marvinmarnold Nov 14, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
# @global-owner1 and @global-owner2 will be requested for
# review when someone opens a pull request.
* @NebraLtd/developers
* @NebraLtd/tech-support

# See example for more details: https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github/about-code-owners#example-of-a-codeowners-file
27 changes: 27 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,33 @@ Repo: [github.com/balenablocks/dbus](https://github.com/balenablocks/dbus)

This container configures a DBus session bus instance that is used by the gateway config container to communicate with the miner code (note that there is also a separate system bus running on the host OS which is used by gateway config to communicate with bluez for configuring Bluetooth services). This removes the need to have a custom `com.helium.Miner.conf` dbus config file on the host OS as was done previously (and meant we had to run a custom balena device type).

# Quick Start

This is a guide to help you get started with the repository and get it running on your local device. This guide is focused on pushing the repository onto a Raspberry Pi using Balena.

**Prerequisites:**
- Local Test Device (Ex: Raspberry Pi)
- Computer for development and pushing to the device
- Git installed - [download here](https://git-scm.com/downloads)
- [Balena CLI](https://github.com/balena-io/balena-cli) (Install located on Balena step in quick start steps below)

### Quick Start Steps

**Step 1:** Clone the repository to your local machine using one of the following commands:
- HTTP: `git clone https://github.com/NebraLtd/helium-miner-software.git`
- SSH: `git clone [email protected]:NebraLtd/helium-miner-software.git`

**Step 2:** Follow the [getting started guide](https://www.balena.io/docs/learn/getting-started/raspberrypi3/nodejs/) for Balena to help you install Balena on your local test device and get a fleet setup so you can start pushing code to it.

**Step 3:** Once you've gone through the steps and have Balena setup with your device in your fleet, open your cli terminal and navigate to the root directory of the cloned repository (Ex: /usr/name/documents/helium-miner-software).

**Step 4:** Once you're at the root directory. You want to push the code by running the following command:
```bash
$ balena push <fleet-name>
```

**Step 5:** Once complete check your fleet on the Balena dashboard and all modules should be running on the local test device.

# Device Configuration / Fleet Configuration Notes

For some Nebra Hotspots that use spidev1.2 you may need to add a DT overlay in the device or fleet configuration section on balenaCloud to enable spi1.
Expand Down
14 changes: 8 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ version: '2'
services:

gateway-config:
image: nebraltd/hm-config:951749c
image: nebraltd/hm-config:8070d87
depends_on:
- dbus-session
- diagnostics
environment:
- FIRMWARE_VERSION=2021.11.11.0
- FIRMWARE_VERSION=2021.11.11.0-1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd like to ensure that this non standard version number layout doesn't cause any issues with diagnostics and config

Don't see why it would, but just in case

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the way we've done it in the past? 2021.11.11.0.1?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would have been 2021.11.11.1

I think your way is the best. Just want to make sure it doesn't cause any issues with anything. Can't see why it would in particular was just a thought

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We treat it as a string, so this really shouldn't cause any issues and it has passed QA.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vpetersson we didn't QA it with this version number...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@KevinWassermann94 can you check some production devices to see that the version number hasn't caused any issues?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shawaj Should be covered in the QC playbook already (correct me if i'm wrong @KevinWassermann94).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shawaj I am waiting for the production to update.

@vpetersson We should add a term to the GA playbook that no further commits should be pushed to a PR without testing them on the testnet first

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@KevinWassermann94 we can solve that by signing off a particular commit hash.

- DBUS_SYSTEM_BUS_ADDRESS=unix:path=/host/run/dbus/system_bus_socket
- DBUS_SESSION_BUS_ADDRESS=unix:path=/session/dbus/session_bus_socket
privileged: true
Expand All @@ -25,7 +25,9 @@ services:
stop_signal: SIGINT

packet-forwarder:
image: nebraltd/hm-pktfwd:1213210
image: nebraltd/hm-pktfwd:3f7c41e
depends_on:
- helium-miner
restart: always
privileged: true
volumes:
Expand Down Expand Up @@ -56,9 +58,9 @@ services:
- RELEASE_BUMPER=foobar

diagnostics:
image: nebraltd/hm-diag:d9ab173
image: nebraltd/hm-diag:12420cf
environment:
- FIRMWARE_VERSION=2021.11.11.0
- FIRMWARE_VERSION=2021.11.11.0-1
volumes:
- pktfwdr:/var/pktfwd
- miner-storage:/var/data
Expand All @@ -72,7 +74,7 @@ services:
io.balena.features.sysfs: 1

upnp:
image: nebraltd/hm-upnp:5672229
image: nebraltd/hm-upnp:9c18f02
network_mode: host
restart: on-failure
volumes:
Expand Down