wip: e2e-dev-ap-forgejo-mastodon #2

Draft
jem wants to merge 160 commits from e2e-dev-ap-forgejo-mastodon into mastodon
Owner
No description provided.
jem added 85 commits 2025-11-11 06:45:41 +00:00
This reverts commit 2b7651abea.
update readme
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
a583aacb33
wip: outer container definition
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
7c7c108914
changed way to clone
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
f1eff398cb
revert changes
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
56b7cea8d7
compose now works inside e2e-test-container
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
d229c7a4ff
test now works
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
b2ba307045
mv cert geneeration in to container init
Some checks failed
/ actions (pull_request) Has been cancelled
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
5dacd146d9
reflect mv of compose
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
717291fa92
refactoring running ok test state
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
e6653c6216
fix running test ok
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
0535d485cb
refactoring generate_certs
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
0c86613a12
update readme
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
e231d729f8
fix update readme
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
17e1b227f0
jem left a comment

pls. change

pls. change
README.md Outdated
@ -133,0 +148,4 @@
In end-to-end root folder:
```bash
podman build -t forgejo-mastodon-end2end .
Author
Owner

rename to forgejo-end2end

rename to forgejo-end2end
patdyn marked this conversation as resolved
@ -0,0 +1,19 @@
#!/usr/bin/env bash
Author
Owner

mv these scripts to folder forgejo-end2end-image

mv these scripts to folder forgejo-end2end-image
@ -0,0 +4,4 @@
source ../../lib/lib.sh
sudo chown -R forgejo-tests:forgejo-tests /usr/local/share/ca-certificates/
sudo chown -R forgejo-tests:forgejo-tests forgejo-one/certs/
Author
Owner

this should happen in init.sh

this should happen in init.sh
patdyn marked this conversation as resolved
@ -0,0 +9,4 @@
ip=$(hostname -I | cut -f1 -d' ')
host="forgejo-one"
sudo update-ca-certificates
Author
Owner

this should happen in init.sh

this should happen in init.sh
patdyn marked this conversation as resolved
@ -0,0 +12,4 @@
sudo update-ca-certificates
echo -e "\nGenerating $host self-signed certificate"
generate_certs ${ip} ${host}
Author
Owner

ip has to be removed from cert gen.

ip has to be removed from cert gen.
Owner

Test with mastodon

Test with mastodon
@ -1,6 +1,7 @@
#!/usr/bin/env bash
source $SCENARIO_DIR/../../lib/lib.sh
export FEDERATION_INSTANCES="ONE"
Author
Owner

we do not need three any more?

we do not need three any more?
Owner

needs to wait until forgejo runs properly

needs to wait until forgejo runs properly
@ -7,3 +7,3 @@
if [[ -e "$tmpdir" ]]; then
tmpdir="$(cat "$tmpdir")"
podman-compose -f "$tmpdir/podman-compose.yaml" down
podman-compose -f "$tmpdir/compose.yaml" down
Author
Owner

where does tmpdir come from ?

where does tmpdir come from ?
lib/lib.sh Outdated
@ -477,0 +478,4 @@
function generate_certs() {
ip=${1}
Author
Owner

remove ip!

remove ip!
Owner

Test with mastodon

Test with mastodon
@ -0,0 +1,19 @@
#!/usr/bin/env bash
## mastodon-streaming
docker cp $HOME/tmp/docker_images_export/code.forgejo.org.federation.mastodon-streaming.v4.4.5-test.tgz $(docker container ls | awk 'NR==2 {print $1}'):/tmp/code.forgejo.org.federation.mastodon-streaming.v4.4.5-test.tgz
Author
Owner

pls use podman here

pls use podman here
Owner

Deleting cp bases will also solve this

Deleting cp bases will also solve this
@ -0,0 +3,4 @@
[server]
APP_DATA_PATH = ${WORK_PATH}/data
DOMAIN = ${IP}
Author
Owner

use compose hostname here.

use compose hostname here.
patdyn marked this conversation as resolved
@ -0,0 +1,96 @@
services:
forgejo-one:
Author
Owner

forgejo-THREE

forgejo-THREE
patdyn marked this conversation as resolved
@ -0,0 +1,3 @@
#!/usr/bin/env bash
Author
Owner

here cert update has to come here

here cert update has to come here
patdyn marked this conversation as resolved
rename image, consistent use of forgejo-THREE app service name
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
7a659b9a18
wip: no IP in forgejo-THREE
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
140f22b36a
Move user creation to setup
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
1eab09d600
Don't send to background
Some checks failed
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ build (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
176e991a58
We can not be root in the mastodon container otherwise
We're on the host here
Check for server up
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
f0007852b9
Lowercase
Some checks failed
/ build (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
b6a4eedfeb
Otherwise we'll get mismatched hostnames
Update readme
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
720620e884
federation: start proxy in compose; add forgejo-THREE
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
e2d34bd41d
cleanup init of mastodon
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
055a2410af
isolated sleep :-)
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
b2c967ddda
federation/THREE: disable COOKIE_SECURE
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
1904a91fcb
The federation does work over HTTPS but the local communication happens
over HTTP. Setting HTTPS as the root URL sets the login cookies to
secure, not permitting a login over HTTP. COOKIE_SECURE can be set to
override this behaviour.
gitignore
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
6526dc9621
The new forgejo-THREE setup also uses the existing, HTTP only, tooling.
Mastodon uses <domain>:<port> as the key ID. When using mastodon_web as
the hostname, it doesn't get set outside of the container, where forgejo
is running.
Podman healthcheck depend on systemd timers. When running the test
inside a container (podman-in-podman), no init system is present which
would schedule the healthchecks.
Merge remote-tracking branch 'famfo/mastodon-proxy' into e2e-dev-ap-forgejo-mastodon
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
75d7629436
describe setup roughly
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
260d186501
update test setup & describe first test
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
694c91848c
update image
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
2bf2c36bb1
adjust mastodon setup to use production
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
55aab86e35
finished setup for a working follow
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
7827e53389
minor changes
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
65cc035e7d
start redis clean
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
e267fa6851
adjust to modified mastodon container build
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
e853eba516
mastodon/compose: move forgejo config to file
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
42601cd4e2
minor fixes
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
25e57ccf2d
add mail for more complexity
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
cab509a738
Some checks failed
/ build (pull_request) Has been cancelled
/ packages (pull_request) Has been cancelled
/ actions (pull_request) Has been cancelled
/ federation (pull_request) Has been cancelled
/ upgrade and storage (pull_request) Has been cancelled
This pull request is marked as a work in progress.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin e2e-dev-ap-forgejo-mastodon:e2e-dev-ap-forgejo-mastodon
git switch e2e-dev-ap-forgejo-mastodon

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 switch mastodon
git merge --no-ff e2e-dev-ap-forgejo-mastodon
git switch e2e-dev-ap-forgejo-mastodon
git rebase mastodon
git switch mastodon
git merge --ff-only e2e-dev-ap-forgejo-mastodon
git switch e2e-dev-ap-forgejo-mastodon
git rebase mastodon
git switch mastodon
git merge --no-ff e2e-dev-ap-forgejo-mastodon
git switch mastodon
git merge --squash e2e-dev-ap-forgejo-mastodon
git switch mastodon
git merge --ff-only e2e-dev-ap-forgejo-mastodon
git switch mastodon
git merge e2e-dev-ap-forgejo-mastodon
git push origin mastodon
Sign in to join this conversation.
No reviewers
No labels
No milestone
No project
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.

Dependencies

No dependencies set

Reference
meissa/forgejo-end-to-end!2
No description provided.