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

Remove Vagrant development environment (and a couple of small related fixes) #5600

Merged
merged 3 commits into from
Feb 10, 2024
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
92 changes: 0 additions & 92 deletions Vagrantfile

This file was deleted.

1 change: 1 addition & 0 deletions devel/ansible-podman/containers/bodhi/bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ alias bstart="systemctl start bodhi.service celery.service fm-consumer@config.se
alias bstop="systemctl stop bodhi.service celery.service fm-consumer@config.service fm-consumer@printer.service"
alias blint="pre-commit run -a"
alias bmessages="journalctl -u fm-consumer@printer -f"
alias bodhi-shell="python3 /usr/bin/pshell /etc/bodhi/production.ini"


function bresetdb {
Expand Down
3 changes: 3 additions & 0 deletions devel/ansible-podman/containers/bodhi/bodhi.service
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ WorkingDirectory=/bodhi/bodhi-server
ExecStartPre=/usr/bin/poetry -C /bodhi/bodhi-messages install --only-root
ExecStartPre=/usr/bin/poetry -C /bodhi/bodhi-client install --only-root
ExecStartPre=/usr/bin/poetry -C /bodhi/bodhi-server install --only-root
# the shebang on pshell breaks this in the container environment,
# so we just replace it with an alias in bashrc
ExecStartPre=rm -f /usr/local/bin/bodhi-shell
ExecStartPre=/usr/local/bin/bodhi-wait.py
# we don't run alembic and pserve directly from /usr/bin as some
# options in their shebangs break finding our bodhi modules
Expand Down

This file was deleted.

15 changes: 15 additions & 0 deletions devel/ansible-podman/roles/podman/files/greenwave-settings.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
HOST = '0.0.0.0'
PORT = 6545
DEBUG = False
POLICIES_DIR = '/etc/greenwave/policies/'
DIST_GIT_BASE_URL = 'https://src.fedoraproject.org'
DIST_GIT_URL_TEMPLATE = '{DIST_GIT_BASE_URL}/{pkg_namespace}/{pkg_name}/raw/{rev}/f/gating.yaml'
KOJI_BASE_URL = 'https://koji.fedoraproject.org/kojihub'

SECRET_KEY = 'this-is-only-for-development'
WAIVERDB_API_URL = 'http://bodhi-dev-waiverdb:6544/api/v1.0'
RESULTSDB_API_URL = 'https://resultsdb.fedoraproject.org/api/v2.0'
CORS_URL = '*'
CACHE = {
"backend": "dogpile.cache.memory_pickle",
}

This file was deleted.

11 changes: 11 additions & 0 deletions devel/ansible-podman/roles/podman/files/waiverdb-settings.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
DATABASE_URI = 'postgresql+psycopg2://waiverdb@bodhi-dev-database:5432/waiverdb'
RESULTSDB_API_URL = 'https://resultsdb.fedoraproject.org/api/v2.0'
SECRET_KEY = 'this-is-only-for-development'
CORS_URL = '*'

# MESSAGE_BUS_PUBLISH = True
MESSAGE_BUS_PUBLISH = False

AUTH_METHOD = 'dummy'
SUPERUSERS = ['bodhi_user']
PORT = 6544
12 changes: 0 additions & 12 deletions devel/ansible-podman/roles/podman/tasks/prep.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,6 @@
- waiverdb-settings.py
- greenwave-settings.py

- name: Adjust waiverdb hostname in greenwave settings for this environment
ansible.builtin.replace:
path: /tmp/bodhi-dev/greenwave-settings.py
regexp: 'waiverdb:6544'
replace: 'bodhi-dev-waiverdb:6544'

- name: Adjust database hostname in waiverdb settings for this environment
ansible.builtin.replace:
path: /tmp/bodhi-dev/waiverdb-settings.py
regexp: 'wdb:5432'
replace: 'bodhi-dev-database:5432'

- name: Copy various required executable files into place
ansible.builtin.copy:
src: "{{ item }}"
Expand Down
19 changes: 0 additions & 19 deletions devel/ansible/playbook.yml

This file was deleted.

5 changes: 0 additions & 5 deletions devel/ansible/roles/bodhi/defaults/main.yml

This file was deleted.

77 changes: 0 additions & 77 deletions devel/ansible/roles/bodhi/files/.bashrc

This file was deleted.

3 changes: 0 additions & 3 deletions devel/ansible/roles/bodhi/files/.vimrc

This file was deleted.

7 changes: 0 additions & 7 deletions devel/ansible/roles/bodhi/files/bodhi.httpd.conf

This file was deleted.

13 changes: 0 additions & 13 deletions devel/ansible/roles/bodhi/files/bodhi.service

This file was deleted.

62 changes: 0 additions & 62 deletions devel/ansible/roles/bodhi/files/bodhi.toml

This file was deleted.

13 changes: 0 additions & 13 deletions devel/ansible/roles/bodhi/files/celery.service

This file was deleted.

23 changes: 0 additions & 23 deletions devel/ansible/roles/bodhi/files/motd

This file was deleted.

Loading