Skip to content

Commit 8b2b6b1

Browse files
authored
Merge pull request #8 from ubuntu-robotics/feat/noetic-virtual
Noetic virtual image
2 parents 017c21a + cd73000 commit 8b2b6b1

32 files changed

+413
-835
lines changed

.github/workflows/ubuntu-core-image.yaml

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ name: TurtleBot3c Ubuntu Core image
22
on:
33
push:
44
branches:
5-
- noetic
5+
- noetic-virtual
66
tags:
77
- '*'
88
pull_request:
99
branches:
10-
- noetic
10+
- noetic-virtual
1111
workflow_dispatch:
1212

1313
jobs:
@@ -46,6 +46,24 @@ jobs:
4646
with:
4747
name: turtlebot3c-ubuntu-image
4848
path: turtlebot3c.img
49+
qcow2-convertion:
50+
runs-on: ubuntu-latest
51+
needs: ubuntu-image
52+
steps:
53+
- name: Download TurtleBot3c image
54+
uses: actions/download-artifact@v4
55+
with:
56+
name: turtlebot3c-ubuntu-image
57+
path: .
58+
- name: Install qemu-utils
59+
run: sudo apt-get install -y qemu-utils
60+
- name: Convert image to qcow2
61+
run: qemu-img convert -f raw turtlebot3c.img -O qcow2 turtlebot3c.qcow2
62+
- name: Upload artifact
63+
uses: actions/upload-artifact@v4
64+
with:
65+
name: turtlebot3c-ubuntu-qcow2-image
66+
path: turtlebot3c.qcow2
4967
release-image:
5068
runs-on: ubuntu-latest
5169
needs: ubuntu-image
@@ -58,15 +76,23 @@ jobs:
5876
with:
5977
name: turtlebot3c-ubuntu-image
6078
path: .
79+
- name: Download TurtleBot3c qcow2 image
80+
uses: actions/download-artifact@v4
81+
with:
82+
name: turtlebot3c-ubuntu-qcow2-image
83+
path: .
6184
# The image must be compressed.
6285
# GH release max file size is 2GB
6386
# and the uncompressed image is 3.5GB.
6487
- name: Compress the Ubuntu image
6588
run: |
6689
tar czf turtlebot3c.img.tar.gz turtlebot3c.img
90+
- name: Compress the Ubuntu qcow2 image
91+
run: |
92+
tar czf turtlebot3c.qcow2.tar.gz turtlebot3c.qcow2
6793
- name: Release
6894
uses: softprops/action-gh-release@v2
6995
with:
7096
files: |
7197
turtlebot3c.img.tar.gz
72-
98+
turtlebot3c.qcow2.tar.gz

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
*.snap*
22
*.img*
3+
*.qcow2*

README.md

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,6 @@ The image contains the TurtleBot3c snaps:
1010
- [turtlebot3c-nav](https://snapcraft.io/turtlebot3c-nav)
1111
- [turtlebot3c-teleop](https://snapcraft.io/turtlebot3c-teleop)
1212

13-
The image creates a Hotspot called `turtlebot3c`
14-
with the password `turtlebot3c`.
15-
16-
Once connected to the hotspot,
17-
the robot is available on the network as `turtelbot3c.local`.
18-
Mind that you need avahi installed on your remote machine, see e.g. `snap install avahi`.
19-
2013
Remember to set up the `ROS_MASTER_URI` to point to the robot:
2114

2215
```bash
@@ -26,10 +19,10 @@ ROS_MASTER_URI=http://turtelbot3c.local:11311/
2619
## Download the image
2720

2821
The image can be downloaded from the
29-
[latest release](https://github.com/ubuntu-robotics/turtlebot3c-ubuntu-core/releases/latest).
22+
[releases page](https://github.com/ubuntu-robotics/turtlebot3c-ubuntu-core/releases).
3023

31-
After downloading the file `turtlebot3c.img.tar.gz`
32-
and decompressing it, the image can be written to an SD card.
24+
After downloading the file `turtlebot3c.qcow2.tar.gz` and decompressing it,
25+
the image can be imported into LXD.
3326

3427
## Build the image
3528

@@ -56,9 +49,9 @@ snap sign -k tb3c-key turtlebot3c-model.json > turtlebot3c.model
5649
[Generate the image](https://ubuntu.com/core/docs/build-write-image):
5750

5851
```bash
59-
ubuntu-image snap turtlebot3c.model --snap ./turtlebot3c-gadget/turtlebot3c-pi_*_arm64.snap
52+
ubuntu-image snap turtlebot3c.model --snap ./turtlebot3c-gadget/turtlebot3c-*.snap
6053
```
6154

6255
### Boot the image
6356

64-
Write the generated image on an SD card with the [rpi-imager](https://snapcraft.io/rpi-imager) and boot.
57+
@todo

turtlebot3c-gadget/.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
parts/
2+
prime/
3+
stage/
4+
pc_*.snap

turtlebot3c-gadget/.travis.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
language: minimal
2+
os: linux
3+
dist: bionic
4+
sudo: enabled
5+
addons:
6+
snaps:
7+
- name: snapcraft
8+
channel: edge
9+
classic: true
10+
- name: core20
11+
channel: edge
12+
13+
script:
14+
- sudo apt update
15+
- sudo snapcraft snap --provider=host --destructive-mode

turtlebot3c-gadget/Makefile

Lines changed: 0 additions & 156 deletions
This file was deleted.

turtlebot3c-gadget/README.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# 64bit PC Gadget Snap
2+
3+
This repository contains the official Ubuntu Core gadget snap for 64bit
4+
Personal Computers using Intel or AMD processors.
5+
6+
## Gadget Snaps
7+
8+
Gadget snaps are a special type of snaps that contain device specific support
9+
code and data. You can read more about them in the snapd wiki
10+
https://github.com/snapcore/snapd/wiki/Gadget-snap
11+
12+
## Reporting Issues
13+
14+
Please report all issues on the Launchpad project page
15+
https://bugs.launchpad.net/snap-pc/+filebug
16+
17+
We use Launchpad to track issues as this allows us to coordinate multiple
18+
projects better than what is available with Github issues.
19+
20+
## Building
21+
22+
To build the gadget snap locally please use `snapcraft`.
23+
24+
## Launchpad Mirror and Automatic Builds.
25+
26+
All commits from the master branch of https://github.com/snapcore/pc-amd64
27+
are automatically mirrored by Launchpad to the https://launchpad.net/snap-pc
28+
project.
29+
30+
The master branch is automatically built from the launchpad mirror and
31+
published into the snap store to the edge channel.
32+
33+
You can find build history and other controls here:
34+
https://code.launchpad.net/~canonical-foundations/+snap/pc-amd64

turtlebot3c-gadget/configs/core/cmdline.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

turtlebot3c-gadget/configs/core/config.txt.arm64

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)