Skip to content

drop support for building on bionic #115

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.

Sign up for GitHub

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

Merged
Rob-Johnson merged 1 commit into from
Mar 12, 2026
Merged

drop support for building on bionic #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 DEVELOPER.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

## Building a testing deb

Manually edit `./src/debian/changelog` and add a new entry/change the version in the top-most entry to a distinct version. Run `make package_bionic` where bionic is the Ubuntu codename you want to test on. Afterwards you'll have a new .deb file in `dist/`.
Manually edit `./src/debian/changelog` and add a new entry/change the version in the top-most entry to a distinct version. Run `make package_jammy`. Afterwards you'll have a new .deb file in `dist/`.

## Releasing

Expand All @@ -13,4 +13,4 @@ We pin the nerve-tools version in puppet hieradata, so you can roll out new vers

## Testing

Run `make itest_bionic` where bionic is the Ubuntu distribution to test for.
Run `make itest_jammy`.
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RELEASE = v$(VERSION)
LAST_COMMIT_MSG = $(shell git log -1 --pretty=%B | sed -e 's/\x27/"/g')
.PHONY: release
release:
dch -v $(VERSION) --distribution bionic --changelog src/debian/changelog '$(LAST_COMMIT_MSG)'
dch -v $(VERSION) --distribution jammy --changelog src/debian/changelog '$(LAST_COMMIT_MSG)'
git ci -am 'Released $(VERSION) via make release'
git tag $(RELEASE) master
git show
Expand Down
41 changes: 0 additions & 41 deletions dockerfiles/bionic/Dockerfile
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions dockerfiles/bionic/docker-compose.yml
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions dockerfiles/itest/docker-compose-bionic.yml
View file
Open in desktop

This file was deleted.

53 changes: 0 additions & 53 deletions dockerfiles/itest/itest/Dockerfile.bionic
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,6 @@ setenv =
TZ = UTC
PIP_INDEX_URL = {env:PIP_INDEX_URL:https://pypi.yelpcorp.com/simple}

[testenv:package_bionic]
allowlist_externals = cp
setenv =
COMPOSE_FILE = dockerfiles/bionic/docker-compose.yml
commands =
cp dockerfiles/itest/itest/yelpsoa-configs/location_mapping.json dockerfiles/itest/itest/yelpsoa-configs/location_types.json dockerfiles/bionic/
docker-compose down
docker-compose --verbose build --no-cache --build-arg PIP_INDEX_URL={env:PIP_INDEX_URL:https://pypi.yelpcorp.com/simple}
docker-compose run bionic
docker-compose stop
docker-compose rm --force

[testenv:package_jammy]
allowlist_externals = cp
setenv =
Expand All @@ -39,18 +27,6 @@ commands =
docker-compose stop
docker-compose rm --force

[testenv:itest_bionic]
setenv =
COMPOSE_PROJECT_NAME=nerve_tools_bionic
COMPOSE_FILE = dockerfiles/itest/docker-compose-bionic.yml
SSH_AUTH_SOCK={env:SSH_AUTH_SOCK}
commands =
docker-compose down
docker-compose --verbose build --no-cache --build-arg PIP_INDEX_URL={env:PIP_INDEX_URL:https://pypi.yelpcorp.com/simple}
docker-compose run itest
docker-compose stop
docker-compose rm --force

[testenv:itest_jammy]
setenv =
COMPOSE_PROJECT_NAME=nerve_tools_jammy
Expand Down
Loading