Skip to content

Commit 9f547d2

Browse files
mtlynchdb39
andauthored
Delete Ansible from installation process (#1604)
Resolves #1598 Resolves #1596 This reimplements the `load-tc358743-edid` service without Ansible, which completes our process of eliminating Ansible from TinyPilot's install process. The last real piece was moving the installation of the `load-tc358743-edid` from Ansible to Debian. The rest is just deleting remaining Ansible files and stray references to Ansible. Note that in deleting the Ansible environment setup, we delete `apt-get update --allow-releaseinfo-change-suite` which we added in #764. I don't think we need this command anymore, but we can bring it back in the future if we find that we need it. ## Manual tests I ran the following manual tests: * Verified keyboard and mouse still worked * Verified that I could still adjust video settings * Verified that audio still worked in H.264 (on Voyager systems) For the following scenarios: - [x] Install on a bare Raspbian system - [x] Install on a bare Raspbian system with TC358743 enabled - [x] Install a Pro Voyager image - [x] Install a Pro Hobbyist image - [x] Install a bundle on a Pro 2.6.0 Voyager image to simulate an update ## Peer testing To test this bundle run: ```bash curl \ --silent \ --show-error \ --location \ https://raw.githubusercontent.com/tiny-pilot/tinypilot/master/scripts/install-bundle | \ sudo bash -s -- \ https://output.circle-artifacts.com/output/job/a5f0e73a-fc7b-4025-b6ce-c8f05c4be707/artifacts/0/bundler/dist/tinypilot-community-20230901T1513Z-1.9.0-109+51dc0af.tgz && \ sudo reboot ``` <a data-ca-tag href="https://codeapprove.com/pr/tiny-pilot/tinypilot/1604"><img src="https://codeapprove.com/external/github-tag-allbg.png" alt="Review on CodeApprove" /></a> --------- Co-authored-by: David Brown <[email protected]>
1 parent a7cc8d0 commit 9f547d2

26 files changed

+5
-444
lines changed

.circleci/continue_config.yml

-30
Original file line numberDiff line numberDiff line change
@@ -181,33 +181,6 @@ jobs:
181181
--fail-on warning,error \
182182
"${file}"
183183
done < <(ls *.deb)
184-
build_ansible_role:
185-
machine:
186-
image: ubuntu-2004:202010-01
187-
resource_class: large
188-
working_directory: ~/project/ansible-role-ustreamer
189-
steps:
190-
- unless:
191-
condition: << pipeline.parameters.ansible_role_changed >>
192-
steps:
193-
- run:
194-
name: Skipping job because files weren't changed
195-
command: circleci-agent step halt
196-
- checkout:
197-
path: ~/project
198-
- run:
199-
name: Create virtual environment
200-
command: python3 -m venv venv
201-
- run:
202-
name: Test role with molecule
203-
command: |
204-
. venv/bin/activate && \
205-
pip install --upgrade pip && \
206-
pip install wheel==0.34.2 && \
207-
pip install -r molecule/requirements.txt && \
208-
ansible --version && \
209-
molecule --version && \
210-
molecule test
211184
build_bundle:
212185
docker:
213186
- image: cimg/python:3.9.17
@@ -301,9 +274,6 @@ workflows:
301274
- lint_debian_package:
302275
requires:
303276
- build_debian_package
304-
- build_ansible_role:
305-
requires:
306-
- build_debian_package
307277
- build_bundle:
308278
requires:
309279
- build_debian_package

README.md

-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ See the [CONTRIBUTING](CONTRIBUTING.md) file.
8282
## Other installation options
8383

8484
- [Advanced installation options](https://github.com/tiny-pilot/tinypilot/wiki/Installation-Options#advanced-installation)
85-
- [Remote installation via Ansible](https://github.com/tiny-pilot/tinypilot/wiki/Installation-Options#remote-installation)
8685

8786
## Updates
8887

ansible-role-ustreamer/.gitignore

-1
This file was deleted.

ansible-role-ustreamer/.yamllint

-33
This file was deleted.

ansible-role-ustreamer/LICENSE

-21
This file was deleted.

ansible-role-ustreamer/README.md

-39
This file was deleted.

ansible-role-ustreamer/handlers/main.yml

-22
This file was deleted.

ansible-role-ustreamer/meta/main.yml

-20
This file was deleted.

ansible-role-ustreamer/molecule/default/converge.yml

-20
This file was deleted.

ansible-role-ustreamer/molecule/default/molecule.yml

-33
This file was deleted.

ansible-role-ustreamer/molecule/requirements.txt

-59
This file was deleted.

ansible-role-ustreamer/tasks/main.yml

-31
This file was deleted.

ansible-role-ustreamer/tasks/provision_tc358743.yml

-12
This file was deleted.

app/license_notice.py

-37
Original file line numberDiff line numberDiff line change
@@ -187,43 +187,6 @@ class LicenseMetadata:
187187
'./venv/lib/python3.*/site-packages/zipp-*.dist-info/LICENSE*',
188188
),
189189

190-
# Ansible dependencies that are not covered above. They are not available
191-
# permanently on the device because we only create ephemeral Ansible install
192-
# environments.
193-
LicenseMetadata(
194-
name='Ansible',
195-
homepage_url='https://www.ansible.com',
196-
license_url=
197-
'https://raw.githubusercontent.com/ansible/ansible/v2.10.7/COPYING'),
198-
LicenseMetadata(
199-
name='cffi',
200-
homepage_url='http://cffi.readthedocs.org/',
201-
license_url='https://foss.heptapod.net/pypy/cffi/-/raw/v1.15.1/LICENSE'
202-
),
203-
LicenseMetadata(
204-
name='cryptography',
205-
homepage_url='https://cryptography.io',
206-
license_url=
207-
'https://raw.githubusercontent.com/pyca/cryptography/37.0.4/LICENSE.BSD'
208-
),
209-
LicenseMetadata(
210-
name='packaging',
211-
homepage_url='https://github.com/pypa/packaging',
212-
license_url=
213-
'https://raw.githubusercontent.com/pypa/packaging/21.3/LICENSE.BSD'),
214-
LicenseMetadata(
215-
name='pycparser',
216-
homepage_url='https://github.com/eliben/pycparser',
217-
license_url=
218-
'https://raw.githubusercontent.com/eliben/pycparser/release_v2.21/LICENSE'
219-
),
220-
LicenseMetadata(
221-
name='pyparsing',
222-
homepage_url='https://github.com/pyparsing/pyparsing/',
223-
license_url=
224-
'https://raw.githubusercontent.com/pyparsing/pyparsing/pyparsing_3.0.9/LICENSE'
225-
),
226-
227190
# Indirect dependencies through Janus.
228191
LicenseMetadata(
229192
name='libnice',

0 commit comments

Comments
 (0)