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

Set ansible playbook tag to install_oshw_tools #52

Merged
merged 6 commits into from
Oct 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM kasmweb/core-ubuntu-jammy:1.13.0
FROM kasmweb/core-ubuntu-jammy:1.13.1
USER root

ENV HOME /home/kasm-default-profile
Expand All @@ -17,7 +17,7 @@ RUN apt update && apt -y install software-properties-common && add-apt-repositor

# run Ansible commands
COPY ./requirements.yaml ./playbook.yaml ./
RUN ansible-galaxy install -r requirements.yaml && ansible-playbook -i,localhost playbook.yaml --tags "all" && rm -f ./*.yaml
RUN ansible-galaxy install -r requirements.yaml && ansible-playbook -i,localhost playbook.yaml --tags "install_oshw_tools" && rm -f ./*.yaml

# Custom Desktop Background - replace bg_custom.png on disk with your own background image
COPY ./bg_custom.png /usr/share/extra/backgrounds/bg_default.png
Expand Down
64 changes: 32 additions & 32 deletions playbook.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@
tags: install_utilities

vars:
git_version: "2.41.0"
git_version: "2.42.0"
git_version_to_install: "1:{{ git_version }}-0ppa1~ubuntu22.04.1"
keychain_version: "2.8.5"
keychain_version_to_install: "{{ keychain_version }}-2"
Expand Down Expand Up @@ -596,6 +596,37 @@
url: https://gist.githubusercontent.com/capsulecorplab/401ba2fe0857a328f2a626adbf078cc6/raw/b89a6234f0d620ff60bcfe37f95de197b8772377/.gitconfig
dest: /home/kasm-default-profile/

-
# install KiCad
hosts: localhost
connection: local
tags:
- install_kicad
- install_oshw_tools

vars:
kicad_version: "7.0.8"
kicad_version_to_install: "{{ kicad_version }}~ubuntu22.04.1"

tasks:
- name: Add PPA repository for KiCad 7.0
shell: add-apt-repository ppa:kicad/kicad-7.0-releases
- name: install KiCad {{ kicad_version }} with Apt
apt:
name: kicad={{ kicad_version_to_install }}
update_cache: yes
install_recommends: yes
- name: Get KiCad version
shell: kicad-cli version
register: installed_kicad_version
- name: Display KiCad versions
debug:
msg: "kicad = {{ installed_kicad_version.stdout }}"
- name: Test KiCad version
fail:
msg: "KiCad Version Error: Expected {{ kicad_version }} | Found {{ installed_kicad_version.stdout }}"
when: installed_kicad_version.stdout != kicad_version

-
# install FreeCAD
hosts: localhost
Expand Down Expand Up @@ -683,37 +714,6 @@
- linkml==1.4.1
- jinja2-cli==0.8.2

-
# install KiCad
hosts: localhost
connection: local
tags:
- install_kicad
- install_oshw_tools

vars:
kicad_version: "7.0.6"
kicad_version_to_install: "{{ kicad_version }}~ubuntu22.04.1"

tasks:
- name: Add PPA repository for KiCad 7.0
shell: add-apt-repository ppa:kicad/kicad-7.0-releases
- name: install KiCad {{ kicad_version }} with Apt
apt:
name: kicad={{ kicad_version_to_install }}
update_cache: yes
install_recommends: yes
- name: Get KiCad version
shell: kicad-cli version
register: installed_kicad_version
- name: Display KiCad versions
debug:
msg: "kicad = {{ installed_kicad_version.stdout }}"
- name: Test KiCad version
fail:
msg: "KiCad Version Error: Expected {{ kicad_version }} | Found {{ installed_kicad_version.stdout }}"
when: installed_kicad_version.stdout != kicad_version

# roles:
# - role: geerlingguy.pip

Expand Down
Loading