Fediversity/Fediversity
13
2
Fork 6
Code Issues 111 Pull requests 15 Projects 1 Activity Actions

Add forgejo-ci machine to our infrastructure #389

Merged
kiara merged 2 commits from kiara/Fediversity:forgejo-ci into main 2025-07-02 17:43:11 +02:00
Conversation 3 Commits 2 Files changed 9 +122 -6
kiara commented 2025-06-17 18:43:26 +02:00
Owner
Copy link

picked up from https://git.fediversity.eu/Fediversity/Fediversity/compare/main...niols:forgejo-ci.

closes #356.

picked up from https://git.fediversity.eu/Fediversity/Fediversity/compare/main...niols:forgejo-ci. closes #356.
kiara force-pushed forgejo-ci from 1a89e5980b to c685cd7cfa 2025-06-18 14:43:47 +02:00 Compare
kiara force-pushed forgejo-ci from 1beae79bbe to 2a2db3e376 2025-06-19 08:33:20 +02:00 Compare
kiara force-pushed forgejo-ci from 2a2db3e376 to 6daa28b0b0 2025-06-19 09:07:10 +02:00 Compare
kiara changed title from WIP: forgejo-ci to forgejo-ci 2025-06-19 10:25:18 +02:00
requested reviews from fricklerhandwerk, Niols 2025-06-19 18:10:48 +02:00
fricklerhandwerk commented 2025-06-20 12:05:46 +02:00
Owner
Copy link

This is a bit too much for me to follow, we should walk through the state and diff in a pairing session.

This is a bit too much for me to follow, we should walk through the state and diff in a pairing session.
👍 1
kiara force-pushed forgejo-ci from 1847c76736 to 6a718cf0d3 2025-06-21 09:50:42 +02:00 Compare
kiara force-pushed forgejo-ci from 6a718cf0d3 to 6ae9bfac9e 2025-06-25 09:28:11 +02:00 Compare
Niols reviewed 2025-06-25 18:56:47 +02:00
infra/forgejo-ci/flake-part.nix Outdated
@ -0,0 +30,4 @@
host = "45.142.234.216";
opts = "-J orianne"; # FIXME
hostPublicKey = hostPublicKey;
};
Niols commented 2025-06-25 18:56:47 +02:00
Owner
Copy link

This is a bit of a problem, and IIRC it was one of the main reasons not to merge at the time:

ssh -J orianne 45.142.234.216

will not work for anyone but me. I suppose a solution would be to just use host = "forgejo-ci" and remove opts, and leave each user configure what to do to reach it in their own .ssh/config.

This is a bit of a problem, and IIRC it was one of the main reasons not to merge at the time: ``` ssh -J orianne 45.142.234.216 ``` will not work for anyone but me. I suppose a solution would be to just use `host = "forgejo-ci"` and remove `opts`, and leave each user configure what to do to reach it in their own `.ssh/config`.
kiara marked this conversation as resolved
Niols commented 2025-06-25 18:58:44 +02:00
Owner
Copy link

This contains a bunch of different things. I think we could extract smaller PRs, eg.:

  • strip the changes to the panel away (what are they doing in here?)
  • a first piece of work updating infra/common and the existing machines
  • a second piece of work adding forgejo-ci
This contains a bunch of different things. I think we could extract smaller PRs, eg.: - strip the changes to the panel away (what are they doing in here?) - a first piece of work updating `infra/common` and the existing machines - a second piece of work adding `forgejo-ci`
👍 1
kiara added 1 commit 2025-06-26 16:59:09 +02:00
abstract out host details
All checks were successful
/ check-pre-commit (pull_request) Successful in 13s
Details
/ check-data-model (pull_request) Successful in 19s
Details
/ check-peertube (pull_request) Successful in 20s
Details
/ check-panel (pull_request) Successful in 1m23s
Details
/ check-deployment-basic (pull_request) Successful in 11m51s
Details
/ check-deployment-cli (pull_request) Successful in 38m27s
Details
/ check-deployment-panel (pull_request) Successful in 42m55s
Details
01c3a7b3c7
kiara added a new dependency 2025-06-27 13:34:45 +02:00
#412 set default value for nixops4Package
kiara added a new dependency 2025-06-27 13:49:32 +02:00
#413 allow configuring network interface
kiara added a new dependency 2025-06-27 13:50:03 +02:00
#414 allow configuring whether a node uses QEMU
fricklerhandwerk reviewed 2025-07-01 10:40:07 +02:00
infra/forgejo-ci/flake-part.nix Outdated
@ -0,0 +9,4 @@
inherit (lib.attrsets) concatMapAttrs optionalAttrs;
inherit (lib.strings) removeSuffix;
secretsPrefix = ../../secrets;
fricklerhandwerk commented 2025-07-01 10:40:07 +02:00
Owner
Copy link

Let's maybe put sources, secrets, keys into _module.args at the evaluation entry point, or even better, some global option as the module gods intended?

Let's maybe put `sources`, `secrets`, `keys` into `_module.args` at the evaluation entry point, or even better, some global option as the module gods intended?
Niols commented 2025-07-01 13:22:49 +02:00
Owner
Copy link

For sources, this is partially tackled by #421.

For `sources`, this is partially tackled by https://git.fediversity.eu/Fediversity/Fediversity/pulls/421.
👍 1
kiara marked this conversation as resolved
kiara force-pushed forgejo-ci from 01c3a7b3c7 to d59be61a1b 2025-07-02 12:43:37 +02:00 Compare
Niols reviewed 2025-07-02 13:07:28 +02:00
infra/flake-part.nix Outdated
@ -169,1 +169,4 @@
# NOTE: `forgejo-ci`, being a physical machine and not a Proxmox VM, gets
# custom treatment.
imports = [ ./forgejo-ci/flake-part.nix ];
Niols commented 2025-07-02 13:07:28 +02:00
Owner
Copy link

Is the treatment really that specific that it needs to get its own flake-part.nix and its own deployment and all?

Is the treatment really that specific that it needs to get its own `flake-part.nix` and its own deployment and all?
kiara marked this conversation as resolved
Niols approved these changes 2025-07-02 13:08:00 +02:00
Niols left a comment
Owner
Copy link

LGTM! Shouldn't we move it to machines/dev instead of having it in infra?

LGTM! Shouldn't we move it to `machines/dev` instead of having it in `infra`?
👍 1
Niols changed title from forgejo-ci to Add forgejo-ci machine to our infrastructure 2025-07-02 13:08:18 +02:00
kiara changed title from Add forgejo-ci machine to our infrastructure to WIP: Add forgejo-ci machine to our infrastructure 2025-07-02 13:11:36 +02:00
kiara force-pushed forgejo-ci from d59be61a1b to 44f5da55f7 2025-07-02 13:43:33 +02:00 Compare
kiara force-pushed forgejo-ci from 44f5da55f7 to d2f694a555 2025-07-02 14:05:27 +02:00 Compare
kiara force-pushed forgejo-ci from d2f694a555 to 447cbbcdd8 2025-07-02 14:07:44 +02:00 Compare
kiara force-pushed forgejo-ci from 447cbbcdd8 to 4ec325f985 2025-07-02 14:58:49 +02:00 Compare
kiara changed title from WIP: Add forgejo-ci machine to our infrastructure to Add forgejo-ci machine to our infrastructure 2025-07-02 14:59:32 +02:00
kiara commented 2025-07-02 15:01:50 +02:00
Author
Owner
Copy link

thanks for your feedback @Niols, i've updated the PR to incorporate it now. would you mind reviewing?

edit: for reference, i have in fact gotten the deployment working now.

thanks for your feedback @Niols, i've updated the PR to incorporate it now. would you mind reviewing? edit: for reference, i have in fact gotten the deployment working now.
kiara added 1 commit 2025-07-02 15:37:38 +02:00
override SSH host - causing host key verification failure
Some checks failed
/ check-pre-commit (pull_request) Has been cancelled
Details
/ check-data-model (pull_request) Has been cancelled
Details
/ check-peertube (pull_request) Has been cancelled
Details
/ check-panel (pull_request) Has been cancelled
Details
/ check-deployment-basic (pull_request) Has been cancelled
Details
/ check-deployment-cli (pull_request) Has been cancelled
Details
/ check-deployment-panel (pull_request) Has been cancelled
Details
e52939dee8
kiara force-pushed forgejo-ci from e52939dee8 to 90ee90711b 2025-07-02 15:38:45 +02:00 Compare
kiara force-pushed forgejo-ci from 90ee90711b to 22d1b43b72 2025-07-02 17:33:37 +02:00 Compare
kiara force-pushed forgejo-ci from 22d1b43b72 to 21b867a312 2025-07-02 17:35:31 +02:00 Compare
kiara force-pushed forgejo-ci from 21b867a312 to 22d1b43b72 2025-07-02 17:38:56 +02:00 Compare
kiara force-pushed forgejo-ci from 22d1b43b72 to b42ec33f22 2025-07-02 17:40:23 +02:00 Compare
kiara force-pushed forgejo-ci from b42ec33f22 to d9574ed4b0 2025-07-02 17:42:48 +02:00 Compare
kiara merged commit 871672d447 into main 2025-07-02 17:43:11 +02:00
kiara deleted branch forgejo-ci 2025-07-02 17:43:12 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
fricklerhandwerk
Niols
Labels
Clear labels   
api service

features that may relate more to a (to be created) API service

  
blocked

   
bug

Anything that doesn't work as advertised

  
component: fediversity panel

   
component: nixops4

   
documentation

   
estimation high: >3d

   
estimation low: <2h

   
estimation mid: <8h

   
productisation

features out-scoped with the decoupling of the productisation effort

  
project-management

Project management related tasks

  
question

   
role: sysadmin

   
security

   
technical debt

   
testing

   
type unclear

   
type: key result

   
type: objective

   
type: task

   
type: user story

   
user experience
No labels
api service
blocked
bug
component: fediversity panel
component: nixops4
documentation
estimation high: >3d
estimation low: <2h
estimation mid: <8h
productisation
project-management
question
role: sysadmin
security
technical debt
testing
type unclear
type: key result
type: objective
type: task
type: user story
user experience
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
3 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Depends on
#412 set default value for nixops4Package
Fediversity/Fediversity
#413 allow configuring network interface
Fediversity/Fediversity
#414 allow configuring whether a node uses QEMU
Fediversity/Fediversity
Reference: Fediversity/Fediversity#389
No description provided.
Delete branch "kiara/Fediversity:forgejo-ci"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?