WIP - netbox integration in CI #112

Open
Solvik wants to merge 2 commits from ci into main
Solvik commented 2020-02-05 11:55:43 +01:00 (Migrated from github.com)
No description provided.
ramnes (Migrated from github.com) reviewed 2020-02-05 15:46:22 +01:00
@ -32,3 +40,4 @@
dmi = parse(dmi_fixture)
server = ServerBase(dmi)
assert server.get_service_tag() == '42'
ramnes (Migrated from github.com) commented 2020-02-05 15:46:21 +01:00

Your test should be deterministic so you shouldn't need to do any try-except, I guess?

Your test should be deterministic so you shouldn't need to do any try-except, I guess?
This pull request has changes conflicting with the target branch.
  • netbox_agent/ipmi.py
  • tests/conftest.py
  • tests/network.py
  • tests/server.py
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin ci:ci
git checkout ci

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout main
git merge --no-ff ci
git checkout ci
git rebase main
git checkout main
git merge --ff-only ci
git checkout ci
git rebase main
git checkout main
git merge --no-ff ci
git checkout main
git merge --squash ci
git checkout main
git merge --ff-only ci
git checkout main
git merge ci
git push origin main
Sign in to join this conversation.
No description provided.