t: refactor dedicated container for pytest

- remove test-obs service
- mock OBS calls using pytest-httpserver
- dedicated container for pytest to make sure it is in the same network as the services
- remove restart of obs-staging-bot and use new poll interval for it
- rework Makefile targets

.gitea/workflows/t.yaml

@@ -40,10 +40,12 @@ jobs:
         run: make down
         working-directory: ./autogits/integration
       - name: Start images
-        run: make up
+        run: |
+          make up
+          make wait_healthy
         working-directory: ./autogits/integration
       - name: Run tests
-        run: py.test-3.11 -v tests
+        run: make pytest
         working-directory: ./autogits/integration
       - name: Make sure the pod is down
         if: always()

common/config.go

@@ -39,6 +39,10 @@ const (
 
 	Permission_ForceMerge = "force-merge"
 	Permission_Group      = "release-engineering"
+
+	MergeModeFF      = "ff-only"
+	MergeModeReplace = "replace"
+	MergeModeDevel   = "devel"
 )
 
 type ConfigFile struct {
@@ -52,9 +56,9 @@ type ReviewGroup struct {
 }
 
 type QAConfig struct {
-	Name   string
-	Origin string
-	Label  string // requires this gitea lable to be set or skipped
+	Name              string
+	Origin            string
+	Label             string   // requires this gitea lable to be set or skipped
 	BuildDisableRepos []string // which repos to build disable in the new project
 }
 
@@ -89,7 +93,8 @@ type AutogitConfig struct {
 	Committers     []string // group in addition to Reviewers and Maintainers that can order the bot around, mostly as helper for factory-maintainers
 	Subdirs        []string // list of directories to sort submodules into. Needed b/c _manifest cannot list non-existent directories
 
-	Labels map[string]string // list of tags, if not default, to apply
+	Labels    map[string]string // list of tags, if not default, to apply
+	MergeMode string            // project merge mode
 
 	NoProjectGitPR     bool // do not automatically create project git PRs, just assign reviewers and assume somethign else creates the ProjectGit PR
 	ManualMergeOnly    bool // only merge with "Merge OK" comment by Project Maintainers and/or Package Maintainers and/or reviewers
@@ -184,6 +189,17 @@ func ReadWorkflowConfig(gitea GiteaFileContentAndRepoFetcher, git_project string
 		}
 	}
 	config.GitProjectName = config.GitProjectName + "#" + branch
+
+	// verify merge modes
+	switch config.MergeMode {
+	case MergeModeFF, MergeModeDevel, MergeModeReplace:
+		break // good results
+	case "":
+		config.MergeMode = MergeModeFF
+	default:
+		return nil, fmt.Errorf("Unsupported merge mode in %s: %s", git_project, config.MergeMode)
+	}
+
 	return config, nil
 }
 

common/config_test.go

@@ -4,6 +4,7 @@ import (
 	"slices"
 	"testing"
 
+	"go.uber.org/mock/gomock"
 	"src.opensuse.org/autogits/common"
 	"src.opensuse.org/autogits/common/gitea-generated/models"
 	mock_common "src.opensuse.org/autogits/common/mock"
@@ -341,3 +342,67 @@ func TestConfigPermissions(t *testing.T) {
 		})
 	}
 }
+
+func TestConfigMergeModeParser(t *testing.T) {
+	tests := []struct {
+		name      string
+		json      string
+		mergeMode string
+		wantErr   bool
+	}{
+		{
+			name:      "empty",
+			json:      "{}",
+			mergeMode: common.MergeModeFF,
+		},
+		{
+			name:      "ff-only",
+			json:      `{"MergeMode": "ff-only"}`,
+			mergeMode: common.MergeModeFF,
+		},
+		{
+			name:      "replace",
+			json:      `{"MergeMode": "replace"}`,
+			mergeMode: common.MergeModeReplace,
+		},
+		{
+			name:      "devel",
+			json:      `{"MergeMode": "devel"}`,
+			mergeMode: common.MergeModeDevel,
+		},
+		{
+			name:    "unsupported",
+			json:    `{"MergeMode": "invalid"}`,
+			wantErr: true,
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			repo := models.Repository{
+				DefaultBranch: "master",
+			}
+
+			ctl := gomock.NewController(t)
+			gitea := mock_common.NewMockGiteaFileContentAndRepoFetcher(ctl)
+			gitea.EXPECT().GetRepositoryFileContent("foo", "bar", "", "workflow.config").Return([]byte(test.json), "abc", nil)
+			gitea.EXPECT().GetRepository("foo", "bar").Return(&repo, nil)
+
+			config, err := common.ReadWorkflowConfig(gitea, "foo/bar")
+			if test.wantErr {
+				if err == nil {
+					t.Fatal("Expected error, got nil")
+				}
+				return
+			}
+
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			if config.MergeMode != test.mergeMode {
+				t.Errorf("Expected MergeMode %s, got %s", test.mergeMode, config.MergeMode)
+			}
+		})
+	}
+}

common/git_utils.go

@@ -288,7 +288,7 @@ func (e *GitHandlerImpl) GitClone(repo, branch, remoteUrl string) (string, error
 func (e *GitHandlerImpl) GitBranchHead(gitDir, branchName string) (string, error) {
 	id, err := e.GitExecWithOutput(gitDir, "show-ref", "--heads", "--hash", branchName)
 	if err != nil {
-		return "", fmt.Errorf("Can't find default branch: %s", branchName)
+		return "", fmt.Errorf("Can't find default branch: %s in %s", branchName, gitDir)
 	}
 
 	id = strings.TrimSpace(SplitLines(id)[0])
@@ -302,7 +302,7 @@ func (e *GitHandlerImpl) GitBranchHead(gitDir, branchName string) (string, error
 func (e *GitHandlerImpl) GitRemoteHead(gitDir, remote, branchName string) (string, error) {
 	id, err := e.GitExecWithOutput(gitDir, "show-ref", "--hash", "--verify", "refs/remotes/"+remote+"/"+branchName)
 	if err != nil {
-		return "", fmt.Errorf("Can't find default branch: %s", branchName)
+		return "", fmt.Errorf("Can't find default branch: %s in %s", branchName, gitDir)
 	}
 
 	return strings.TrimSpace(id), nil

common/obs_utils.go

@@ -537,7 +537,7 @@ func ObsSafeProjectName(prjname string) string {
 }
 
 var ValidBlockModes []string = []string{"all", "local", "never"}
-var ValidPrjLinkModes []string = []string{"off", "localdep", "alldirect", "all"}
+var ValidPrjLinkModes []string = []string{"off", "localdep", "alldirect", "alldirect_or_localdep", "all"}
 var ValidTriggerModes []string = []string{"transitive", "direct", "local"}
 
 func (c *ObsClient) SetProjectMeta(meta *ProjectMeta) error {
@@ -711,13 +711,15 @@ func (r *BuildResultList) BuildResultSummary() (success, finished bool) {
 			if !ok {
 				panic("Unknown result code: " + result.Code)
 			}
-			if r.isLastBuild && result.Code == "unknown" {
-				// it means the package has never build yet,
-				// but we don't know the reason
-				detail.Finished = true
+			if r.isLastBuild {
+				// we are always finished, since it is the last result
+				// also when there is "unknown" state, it just means it
+				// it was never done
+				finished = true
+			} else {
+			        finished = finished && detail.Finished
 			}
 
-			finished = finished && detail.Finished
 			success = success && detail.Success
 
 			if !finished {

common/pr.go

@@ -468,7 +468,7 @@ func (rs *PRSet) IsApproved(gitea GiteaPRChecker, maintainers MaintainershipData
 				LogError("Cannot fetch gita reaviews for PR:", err)
 				return false
 			}
-			r.RequestedReviewers = reviewers
+			r.SetRequiredReviewers(reviewers)
 			prjgit.Reviews = r
 			if prjgit.Reviews.IsManualMergeOK() {
 				is_manually_reviewed_ok = true
@@ -489,7 +489,7 @@ func (rs *PRSet) IsApproved(gitea GiteaPRChecker, maintainers MaintainershipData
 					LogError("Cannot fetch gita reaviews for PR:", err)
 					return false
 				}
-				r.RequestedReviewers = reviewers
+				r.SetRequiredReviewers(reviewers)
 				pr.Reviews = r
 				if !pr.Reviews.IsManualMergeOK() {
 					LogInfo("Not approved manual merge. PR:", pr.PR.URL)
@@ -530,7 +530,7 @@ func (rs *PRSet) IsApproved(gitea GiteaPRChecker, maintainers MaintainershipData
 			LogError("Cannot fetch gitea reaviews for PR:", err)
 			return false
 		}
-		r.RequestedReviewers = reviewers
+		r.SetRequiredReviewers(reviewers)
 
 		is_manually_reviewed_ok = r.IsApproved()
 		LogDebug("PR to", pr.PR.Base.Repo.Name, "reviewed?", is_manually_reviewed_ok)
@@ -554,6 +554,144 @@ func (rs *PRSet) IsApproved(gitea GiteaPRChecker, maintainers MaintainershipData
 	return is_manually_reviewed_ok
 }
 
+func (rs *PRSet) AddMergeCommit(git Git, remote string, pr int) bool {
+	prinfo := rs.PRs[pr]
+
+	LogDebug("Adding merge commit for %s", PRtoString(prinfo.PR))
+	if !prinfo.PR.AllowMaintainerEdit {
+		LogError(" PR is not editable by maintainer")
+		return false
+	}
+
+	repo := prinfo.PR.Base.Repo
+	head := prinfo.PR.Head
+	br := rs.Config.Branch
+	if len(br) == 0 {
+		br = prinfo.PR.Base.Name
+	}
+
+	msg := fmt.Sprintf("Merge branch '%s' into %s", br, head.Name)
+	if err := git.GitExec(repo.Name, "merge", "--no-ff", "--no-commit", "-X", "theirs", head.Sha); err != nil {
+		if err := git.GitExec(repo.Name, "merge", "--no-ff", "--no-commit", "--allow-unrelated-histories", "-X", "theirs", head.Sha); err != nil {
+			return false
+		}
+		LogError("WARNING: Merging unrelated histories")
+	}
+
+	// ensure only files that are in head.Sha are kept
+	git.GitExecOrPanic(repo.Name, "read-tree", "--reset", "-u", head.Sha)
+	git.GitExecOrPanic(repo.Name, "commit", "-m", msg)
+
+	if !IsDryRun {
+		git.GitExecOrPanic(repo.Name, "push", remote, "HEAD:"+head.Name)
+		prinfo.PR.Head.Sha = strings.TrimSpace(git.GitExecWithOutputOrPanic(repo.Name, "rev-list", "-1", "HEAD")) // need to update as it's pushed but pr not refetched
+	}
+
+	return true
+}
+
+func (rs *PRSet) HasMerge(git Git, pr int) bool {
+	prinfo := rs.PRs[pr]
+
+	repo := prinfo.PR.Base.Repo
+	head := prinfo.PR.Head
+	br := rs.Config.Branch
+	if len(br) == 0 {
+		br = prinfo.PR.Base.Name
+	}
+
+	parents, err := git.GitExecWithOutput(repo.Name, "show", "-s", "--format=%P", head.Sha)
+	if err == nil {
+		p := strings.Fields(strings.TrimSpace(parents))
+		if len(p) == 2 {
+			targetHead, _ := git.GitExecWithOutput(repo.Name, "rev-parse", "HEAD")
+			targetHead = strings.TrimSpace(targetHead)
+			if p[0] == targetHead || p[1] == targetHead {
+				return true
+			}
+		}
+	}
+	return false
+}
+
+func (rs *PRSet) PrepareForMerge(git Git) bool {
+	// verify that package can merge here. Checkout current target branch of each PRSet, make a temporary branch
+	// PR_#_mergetest and perform the merge based
+
+	if rs.Config.MergeMode == MergeModeDevel {
+		return true // always can merge as we set branch here, not merge anything
+	} else {
+		// make sure that all the package PRs are in mergeable state
+		for idx, prinfo := range rs.PRs {
+			if rs.IsPrjGitPR(prinfo.PR) {
+				continue
+			}
+
+			repo := prinfo.PR.Base.Repo
+			head := prinfo.PR.Head
+			br := rs.Config.Branch
+			if len(br) == 0 {
+				br = prinfo.PR.Base.Name
+			}
+
+			remote, err := git.GitClone(repo.Name, br, repo.SSHURL)
+			if err != nil {
+				return false
+			}
+			git.GitExecOrPanic(repo.Name, "fetch", remote, head.Sha)
+			switch rs.Config.MergeMode {
+			case MergeModeFF:
+				if err := git.GitExec(repo.Name, "merge-base", "--is-ancestor", "HEAD", head.Sha); err != nil {
+					return false
+				}
+			case MergeModeReplace:
+			Verify:
+				if err := git.GitExec(repo.Name, "merge-base", "--is-ancestor", "HEAD", head.Sha); err != nil {
+					if !rs.HasMerge(git, idx) {
+						forkRemote, err := git.GitClone(repo.Name, head.Name, head.Repo.SSHURL)
+						if err != nil {
+							LogError("Failed to clone head repo:", head.Name, head.Repo.SSHURL)
+							return false
+						}
+						LogDebug("Merge commit is missing and this is not FF merge possibility")
+						git.GitExecOrPanic(repo.Name, "checkout", remote+"/"+br)
+						if !rs.AddMergeCommit(git, forkRemote, idx) {
+							return false
+						}
+						if !IsDryRun {
+							goto Verify
+						}
+					}
+				}
+			}
+		}
+	}
+
+	// now we check project git if mergeable
+	prjgit_info, err := rs.GetPrjGitPR()
+	if err != nil {
+		return false
+	}
+	prjgit := prjgit_info.PR
+
+	_, _, prjgitBranch := rs.Config.GetPrjGit()
+	remote, err := git.GitClone(DefaultGitPrj, prjgitBranch, prjgit.Base.Repo.SSHURL)
+	if err != nil {
+		return false
+	}
+
+	testBranch := fmt.Sprintf("PR_%d_mergetest", prjgit.Index)
+	git.GitExecOrPanic(DefaultGitPrj, "fetch", remote, prjgit.Head.Sha)
+	if err := git.GitExec(DefaultGitPrj, "checkout", "-B", testBranch, prjgit.Base.Sha); err != nil {
+		return false
+	}
+	if err := git.GitExec(DefaultGitPrj, "merge", "--no-ff", "--no-commit", prjgit.Head.Sha); err != nil {
+		return false
+	}
+
+	return true
+}
+
 func (rs *PRSet) Merge(gitea GiteaReviewUnrequester, git Git) error {
 	prjgit_info, err := rs.GetPrjGitPR()
 	if err != nil {
@@ -718,10 +856,8 @@ func (rs *PRSet) Merge(gitea GiteaReviewUnrequester, git Git) error {
 		prinfo.RemoteName, err = git.GitClone(repo.Name, br, repo.SSHURL)
 		PanicOnError(err)
 		git.GitExecOrPanic(repo.Name, "fetch", prinfo.RemoteName, head.Sha)
-
-		if isNewRepo {
-			LogInfo("Force-pushing new repository branch", br, "to", head.Sha)
-			// we don't merge, we just set the branch to this commit
+		if rs.Config.MergeMode == MergeModeDevel || isNewRepo {
+			git.GitExecOrPanic(repo.Name, "checkout", "-B", br, head.Sha)
 		} else {
 			git.GitExecOrPanic(repo.Name, "merge", "--ff", head.Sha)
 		}
@@ -748,11 +884,15 @@ func (rs *PRSet) Merge(gitea GiteaReviewUnrequester, git Git) error {
 		}
 
 		if !IsDryRun {
-			if isNewRepo {
-				git.GitExecOrPanic(repo.Name, "push", "-f", prinfo.RemoteName, prinfo.PR.Head.Sha+":"+prinfo.PR.Base.Name)
-			} else {
-				git.GitExecOrPanic(repo.Name, "push", prinfo.RemoteName)
+			params := []string{"push"}
+			if rs.Config.MergeMode == MergeModeDevel || isNewRepo {
+				params = append(params, "-f")
 			}
+			params = append(params, prinfo.RemoteName)
+			if isNewRepo {
+				params = append(params, prinfo.PR.Head.Sha+":"+prinfo.PR.Base.Name)
+			}
+			git.GitExecOrPanic(repo.Name, params...)
 		} else {
 			LogInfo("*** WOULD push", repo.Name, "to", prinfo.RemoteName)
 		}

common/pr_merge_special_test.go

@@ -73,6 +73,7 @@ func TestPRSet_Merge_Special(t *testing.T) {
 	// Clone and fetch for new-pkg
 	mockGit.EXPECT().GitClone("new-pkg", "main", "pkg-ssh-url").Return("origin", nil)
 	mockGit.EXPECT().GitExecOrPanic("new-pkg", "fetch", "origin", "pkg-head-sha")
+	mockGit.EXPECT().GitExecOrPanic("new-pkg", "checkout", "-B", "main", "pkg-head-sha")
 
 	// Pushing changes
 	mockGit.EXPECT().GitExecOrPanic("_ObsPrj", "push", "origin")

common/pr_test.go

@@ -2,6 +2,7 @@ package common_test
 
 import (
 	"errors"
+	"fmt"
 	"os"
 	"os/exec"
 	"path"
@@ -807,9 +808,8 @@ func TestFindMissingAndExtraReviewers(t *testing.T) {
 							Base: &models.PRBranchInfo{Name: "main", Repo: &models.Repository{Name: "pkg", Owner: &models.User{UserName: "org"}}},
 						},
 						Reviews: &common.PRReviews{
-							Reviews:            []*models.PullReview{{State: common.ReviewStateRequestReview, User: &models.User{UserName: "m1"}}},
-							RequestedReviewers: []string{"m1"},
-							FullTimeline: []*models.TimelineComment{
+							Reviews: []*models.PullReview{{State: common.ReviewStateRequestReview, User: &models.User{UserName: "m1"}}},
+							RequestedReviewers: []*models.TimelineComment{
 								{User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "m1"}, Type: common.TimelineCommentType_ReviewRequested},
 							},
 						},
@@ -919,8 +919,7 @@ func TestFindMissingAndExtraReviewers(t *testing.T) {
 						},
 						Reviews: &common.PRReviews{
 							Reviews:            []*models.PullReview{{State: common.ReviewStateRequestReview, User: &models.User{UserName: "reviewer"}}},
-							RequestedReviewers: []string{"reviewer"},
-							FullTimeline:       []*models.TimelineComment{{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "reviewer"}}},
+							RequestedReviewers: []*models.TimelineComment{{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "reviewer"}}},
 						},
 					},
 					{
@@ -930,8 +929,7 @@ func TestFindMissingAndExtraReviewers(t *testing.T) {
 						},
 						Reviews: &common.PRReviews{
 							Reviews:            []*models.PullReview{{State: common.ReviewStateRequestReview, User: &models.User{UserName: "reviewer"}}},
-							RequestedReviewers: []string{"reviewer"},
-							FullTimeline:       []*models.TimelineComment{{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "reviewer"}}},
+							RequestedReviewers: []*models.TimelineComment{{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "reviewer"}}},
 						},
 					},
 				},
@@ -966,8 +964,7 @@ func TestFindMissingAndExtraReviewers(t *testing.T) {
 								{State: common.ReviewStateApproved, User: &models.User{UserName: "pkgmaintainer"}},
 								{State: common.ReviewStatePending, User: &models.User{UserName: "prjmaintainer"}},
 							},
-							RequestedReviewers: []string{"user2", "pkgmaintainer", "prjmaintainer"},
-							FullTimeline: []*models.TimelineComment{
+							RequestedReviewers: []*models.TimelineComment{
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "user2"}},
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "pkgmaintainer"}},
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "prjmaintainer"}},
@@ -985,8 +982,7 @@ func TestFindMissingAndExtraReviewers(t *testing.T) {
 								{State: common.ReviewStateRequestChanges, User: &models.User{UserName: "user1"}},
 								{State: common.ReviewStateRequestReview, User: &models.User{UserName: "autogits_obs_staging_bot"}},
 							},
-							RequestedReviewers: []string{"user1", "autogits_obs_staging_bot"},
-							FullTimeline: []*models.TimelineComment{
+							RequestedReviewers: []*models.TimelineComment{
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "user1"}},
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "autogits_obs_staging_bot"}},
 							},
@@ -1026,8 +1022,7 @@ func TestFindMissingAndExtraReviewers(t *testing.T) {
 								{State: common.ReviewStatePending, User: &models.User{UserName: "prj2"}},
 								{State: common.ReviewStatePending, User: &models.User{UserName: "someother"}},
 							},
-							RequestedReviewers: []string{"user2", "pkgmaintainer", "prjmaintainer", "pkgm1", "pkgm2", "someother", "prj1", "prj2"},
-							FullTimeline: []*models.TimelineComment{
+							RequestedReviewers: []*models.TimelineComment{
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "pkgmaintainer"}},
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "prjmaintainer"}},
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "prj1"}},
@@ -1050,8 +1045,7 @@ func TestFindMissingAndExtraReviewers(t *testing.T) {
 								{State: common.ReviewStatePending, User: &models.User{UserName: "prj1"}},
 								{State: common.ReviewStatePending, User: &models.User{UserName: "prj2"}},
 							},
-							RequestedReviewers: []string{"user1", "autogits_obs_staging_bot", "prj1", "prj2"},
-							FullTimeline: []*models.TimelineComment{
+							RequestedReviewers: []*models.TimelineComment{
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "autogits_obs_staging_bot"}},
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "prj1"}},
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "prj2"}},
@@ -1090,8 +1084,7 @@ func TestFindMissingAndExtraReviewers(t *testing.T) {
 								{State: common.ReviewStateRequestReview, User: &models.User{UserName: "prj1"}},
 								{State: common.ReviewStateRequestReview, User: &models.User{UserName: "someother"}},
 							},
-							RequestedReviewers: []string{"user2", "pkgmaintainer", "prjmaintainer", "pkgm1", "someother", "prj1"},
-							FullTimeline: []*models.TimelineComment{
+							RequestedReviewers: []*models.TimelineComment{
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "pkgm1"}},
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "pkgmaintainer"}},
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "prjmaintainer"}},
@@ -1112,8 +1105,7 @@ func TestFindMissingAndExtraReviewers(t *testing.T) {
 								{State: common.ReviewStateRequestReview, User: &models.User{UserName: "autogits_obs_staging_bot"}},
 								{State: common.ReviewStateRequestReview, User: &models.User{UserName: "prj1"}},
 							},
-							RequestedReviewers: []string{"user1", "autogits_obs_staging_bot", "prj1"},
-							FullTimeline: []*models.TimelineComment{
+							RequestedReviewers: []*models.TimelineComment{
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "autogits_obs_staging_bot"}},
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "prj1"}},
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "!bot"}, Assignee: &models.User{UserName: "user1"}},
@@ -1199,6 +1191,9 @@ func TestFindMissingAndExtraReviewers(t *testing.T) {
 		t.Run(test.name, func(t *testing.T) {
 			test.prset.HasAutoStaging = !test.noAutoStaging
 			for idx, pr := range test.prset.PRs {
+				if pr.Reviews != nil {
+					pr.Reviews.SetRequiredReviewers(test.prset.Config.Reviewers)
+				}
 				missing, extra := test.prset.FindMissingAndExtraReviewers(test.maintainers, idx)
 
 				// avoid nil dereference below, by adding empty array elements
@@ -1273,7 +1268,7 @@ func TestPRMerge(t *testing.T) {
 						Owner: &models.User{
 							UserName: "org",
 						},
-						SSHURL: "file://" + path.Join(repoDir, "prjgit"),
+						SSHURL: "ssh://git@src.opensuse.org/org/prj.git",
 					},
 				},
 				Head: &models.PRBranchInfo{
@@ -1295,7 +1290,7 @@ func TestPRMerge(t *testing.T) {
 						Owner: &models.User{
 							UserName: "org",
 						},
-						SSHURL: "file://" + path.Join(cmd.Dir, "prjgit"),
+						SSHURL: "ssh://git@src.opensuse.org/org/prj.git",
 					},
 				},
 				Head: &models.PRBranchInfo{
@@ -1405,3 +1400,345 @@ func TestPRChanges(t *testing.T) {
 		})
 	}
 }
+
+func TestPRPrepareForMerge(t *testing.T) {
+	tests := []struct {
+		name     string
+		setup    func(*mock_common.MockGit, *models.PullRequest, *models.PullRequest)
+		config   *common.AutogitConfig
+		expected bool
+		editable bool
+	}{
+		{
+			name: "Success Devel",
+			config: &common.AutogitConfig{
+				Organization:   "org",
+				GitProjectName: "org/_ObsPrj#master",
+				MergeMode:      common.MergeModeDevel,
+			},
+			setup:    func(m *mock_common.MockGit, prjPR, pkgPR *models.PullRequest) {},
+			expected: true,
+		},
+		{
+			name: "Success FF",
+			config: &common.AutogitConfig{
+				Organization:   "org",
+				GitProjectName: "org/_ObsPrj#master",
+				MergeMode:      common.MergeModeFF,
+			},
+			setup: func(m *mock_common.MockGit, prjPR, pkgPR *models.PullRequest) {
+				m.EXPECT().GitClone("pkg", "master", pkgPR.Base.Repo.SSHURL).Return("origin", nil)
+				m.EXPECT().GitExecOrPanic("pkg", "fetch", "origin", pkgPR.Head.Sha)
+				m.EXPECT().GitExec("pkg", "merge-base", "--is-ancestor", "HEAD", pkgPR.Head.Sha).Return(nil)
+
+				m.EXPECT().GitClone("_ObsPrj", "master", prjPR.Base.Repo.SSHURL).Return("origin", nil)
+				m.EXPECT().GitExecOrPanic("_ObsPrj", "fetch", "origin", prjPR.Head.Sha)
+				m.EXPECT().GitExec("_ObsPrj", "checkout", "-B", "PR_1_mergetest", prjPR.Base.Sha).Return(nil)
+				m.EXPECT().GitExec("_ObsPrj", "merge", "--no-ff", "--no-commit", prjPR.Head.Sha).Return(nil)
+			},
+			expected: true,
+		},
+		{
+			name: "Success Replace MergeCommit",
+			config: &common.AutogitConfig{
+				Organization:   "org",
+				GitProjectName: "org/_ObsPrj#master",
+				MergeMode:      common.MergeModeReplace,
+			},
+			setup: func(m *mock_common.MockGit, prjPR, pkgPR *models.PullRequest) {
+				m.EXPECT().GitClone("pkg", "master", pkgPR.Base.Repo.SSHURL).Return("origin", nil)
+				m.EXPECT().GitExecOrPanic("pkg", "fetch", "origin", pkgPR.Head.Sha)
+				// merge-base fails initially
+				m.EXPECT().GitExec("pkg", "merge-base", "--is-ancestor", "HEAD", pkgPR.Head.Sha).Return(fmt.Errorf("not ancestor"))
+				// HasMerge returns true
+				m.EXPECT().GitExecWithOutput("pkg", "show", "-s", "--format=%P", pkgPR.Head.Sha).Return("parent1 target_head", nil)
+				m.EXPECT().GitExecWithOutput("pkg", "rev-parse", "HEAD").Return("target_head", nil)
+
+				m.EXPECT().GitClone("_ObsPrj", "master", prjPR.Base.Repo.SSHURL).Return("origin", nil)
+				m.EXPECT().GitExecOrPanic("_ObsPrj", "fetch", "origin", prjPR.Head.Sha)
+				m.EXPECT().GitExec("_ObsPrj", "checkout", "-B", "PR_1_mergetest", prjPR.Base.Sha).Return(nil)
+				m.EXPECT().GitExec("_ObsPrj", "merge", "--no-ff", "--no-commit", prjPR.Head.Sha).Return(nil)
+			},
+			expected: true,
+		},
+		{
+			name: "Merge Conflict in PrjGit",
+			config: &common.AutogitConfig{
+				Organization:   "org",
+				GitProjectName: "org/_ObsPrj#master",
+				MergeMode:      common.MergeModeFF,
+			},
+			setup: func(m *mock_common.MockGit, prjPR, pkgPR *models.PullRequest) {
+				m.EXPECT().GitClone("pkg", "master", pkgPR.Base.Repo.SSHURL).Return("origin", nil)
+				m.EXPECT().GitExecOrPanic("pkg", "fetch", "origin", pkgPR.Head.Sha)
+				m.EXPECT().GitExec("pkg", "merge-base", "--is-ancestor", "HEAD", pkgPR.Head.Sha).Return(nil)
+
+				m.EXPECT().GitClone("_ObsPrj", "master", prjPR.Base.Repo.SSHURL).Return("origin", nil)
+				m.EXPECT().GitExecOrPanic("_ObsPrj", "fetch", "origin", prjPR.Head.Sha)
+				m.EXPECT().GitExec("_ObsPrj", "checkout", "-B", "PR_1_mergetest", prjPR.Base.Sha).Return(nil)
+				m.EXPECT().GitExec("_ObsPrj", "merge", "--no-ff", "--no-commit", prjPR.Head.Sha).Return(fmt.Errorf("conflict"))
+			},
+			expected: false,
+		},
+		{
+			name: "Not FF in PkgGit",
+			config: &common.AutogitConfig{
+				Organization:   "org",
+				GitProjectName: "org/_ObsPrj#master",
+				MergeMode:      common.MergeModeFF,
+			},
+			setup: func(m *mock_common.MockGit, prjPR, pkgPR *models.PullRequest) {
+				m.EXPECT().GitClone("pkg", "master", pkgPR.Base.Repo.SSHURL).Return("origin", nil)
+				m.EXPECT().GitExecOrPanic("pkg", "fetch", "origin", pkgPR.Head.Sha)
+				m.EXPECT().GitExec("pkg", "merge-base", "--is-ancestor", "HEAD", pkgPR.Head.Sha).Return(fmt.Errorf("not ancestor"))
+			},
+			expected: false,
+		},
+		{
+			name: "Success Replace with AddMergeCommit",
+			config: &common.AutogitConfig{
+				Organization:   "org",
+				GitProjectName: "org/_ObsPrj#master",
+				MergeMode:      common.MergeModeReplace,
+			},
+			editable: true,
+			setup: func(m *mock_common.MockGit, prjPR, pkgPR *models.PullRequest) {
+				m.EXPECT().GitClone("pkg", "master", pkgPR.Base.Repo.SSHURL).Return("origin", nil)
+				m.EXPECT().GitExecOrPanic("pkg", "fetch", "origin", pkgPR.Head.Sha)
+				// First merge-base fails
+				m.EXPECT().GitExec("pkg", "merge-base", "--is-ancestor", "HEAD", pkgPR.Head.Sha).Return(fmt.Errorf("not ancestor"))
+				// HasMerge returns false
+				m.EXPECT().GitExecWithOutput("pkg", "show", "-s", "--format=%P", pkgPR.Head.Sha).Return("parent1", nil)
+				m.EXPECT().GitClone("pkg", pkgPR.Head.Name, pkgPR.Base.Repo.SSHURL).Return("origin_fork", nil)
+				// AddMergeCommit is called
+				m.EXPECT().GitExecOrPanic("pkg", "checkout", "origin/master")
+				m.EXPECT().GitExec("pkg", "merge", "--no-ff", "--no-commit", "-X", "theirs", pkgPR.Head.Sha).Return(nil)
+				m.EXPECT().GitExecOrPanic("pkg", "read-tree", "--reset", "-u", pkgPR.Head.Sha)
+				m.EXPECT().GitExecOrPanic("pkg", "commit", "-m", gomock.Any())
+				m.EXPECT().GitExecOrPanic("pkg", "push", "origin_fork", "HEAD:"+pkgPR.Head.Name)
+				m.EXPECT().GitExecWithOutputOrPanic("pkg", "rev-list", "-1", "HEAD").Return("new_pkg_head_sha")
+				// Second merge-base succeeds (after goto Verify)
+				m.EXPECT().GitExec("pkg", "merge-base", "--is-ancestor", "HEAD", "new_pkg_head_sha").Return(nil)
+
+				m.EXPECT().GitClone("_ObsPrj", "master", prjPR.Base.Repo.SSHURL).Return("origin", nil)
+				m.EXPECT().GitExecOrPanic("_ObsPrj", "fetch", "origin", prjPR.Head.Sha)
+				m.EXPECT().GitExec("_ObsPrj", "checkout", "-B", "PR_1_mergetest", prjPR.Base.Sha).Return(nil)
+				m.EXPECT().GitExec("_ObsPrj", "merge", "--no-ff", "--no-commit", prjPR.Head.Sha).Return(nil)
+			},
+			expected: true,
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			prjPR := &models.PullRequest{
+				Index: 1,
+				Base: &models.PRBranchInfo{
+					Name: "master",
+					Sha:  "base_sha",
+					Repo: &models.Repository{
+						Owner:  &models.User{UserName: "org"},
+						Name:   "_ObsPrj",
+						SSHURL: "ssh://git@src.opensuse.org/org/_ObsPrj.git",
+					},
+				},
+				Head: &models.PRBranchInfo{
+					Sha: "head_sha",
+					Repo: &models.Repository{
+						Owner:  &models.User{UserName: "org"},
+						Name:   "_ObsPrj",
+						SSHURL: "ssh://git@src.opensuse.org/org/_ObsPrj.git",
+					},
+				},
+			}
+
+			pkgPR := &models.PullRequest{
+				Index: 2,
+				Base: &models.PRBranchInfo{
+					Name: "master",
+					Sha:  "pkg_base_sha",
+					Repo: &models.Repository{
+						Owner:  &models.User{UserName: "org"},
+						Name:   "pkg",
+						SSHURL: "ssh://git@src.opensuse.org/org/pkg.git",
+					},
+				},
+				Head: &models.PRBranchInfo{
+					Name: "branch_name",
+					Sha:  "pkg_head_sha",
+					Repo: &models.Repository{
+						Owner:  &models.User{UserName: "org"},
+						Name:   "pkg",
+						SSHURL: "ssh://git@src.opensuse.org/org/pkg.git",
+					},
+				},
+				AllowMaintainerEdit: test.editable,
+			}
+
+			ctl := gomock.NewController(t)
+			git := mock_common.NewMockGit(ctl)
+			test.setup(git, prjPR, pkgPR)
+
+			prset := &common.PRSet{
+				Config: test.config,
+				PRs: []*common.PRInfo{
+					{PR: prjPR},
+					{PR: pkgPR},
+				},
+			}
+
+			if res := prset.PrepareForMerge(git); res != test.expected {
+				t.Errorf("Expected %v, got %v", test.expected, res)
+			}
+		})
+	}
+}
+
+func TestPRMergeMock(t *testing.T) {
+	tests := []struct {
+		name   string
+		setup  func(*mock_common.MockGit, *models.PullRequest, *models.PullRequest)
+		config *common.AutogitConfig
+	}{
+		{
+			name: "Success FF",
+			config: &common.AutogitConfig{
+				Organization:   "org",
+				GitProjectName: "org/_ObsPrj#master",
+				MergeMode:      common.MergeModeFF,
+			},
+			setup: func(m *mock_common.MockGit, prjPR, pkgPR *models.PullRequest) {
+				m.EXPECT().GitClone("_ObsPrj", "master", prjPR.Base.Repo.SSHURL).Return("origin", nil)
+				m.EXPECT().GitExecOrPanic("_ObsPrj", "fetch", "origin", prjPR.Head.Sha)
+				m.EXPECT().GitExec("_ObsPrj", "merge", "--no-ff", "-m", gomock.Any(), prjPR.Head.Sha).Return(nil)
+
+				m.EXPECT().GitClone("pkg", "master", pkgPR.Base.Repo.SSHURL).Return("origin_pkg", nil)
+				m.EXPECT().GitExecOrPanic("pkg", "fetch", "origin_pkg", pkgPR.Head.Sha)
+				m.EXPECT().GitExecOrPanic("pkg", "merge", "--ff", pkgPR.Head.Sha)
+				m.EXPECT().GitExecOrPanic("pkg", "push", "origin_pkg")
+				m.EXPECT().GitExecOrPanic("_ObsPrj", "push", "origin")
+			},
+		},
+		{
+			name: "Success Devel",
+			config: &common.AutogitConfig{
+				Organization:   "org",
+				GitProjectName: "org/_ObsPrj#master",
+				MergeMode:      common.MergeModeDevel,
+			},
+			setup: func(m *mock_common.MockGit, prjPR, pkgPR *models.PullRequest) {
+				m.EXPECT().GitClone("_ObsPrj", "master", prjPR.Base.Repo.SSHURL).Return("origin", nil)
+				m.EXPECT().GitExecOrPanic("_ObsPrj", "fetch", "origin", prjPR.Head.Sha)
+				m.EXPECT().GitExec("_ObsPrj", "merge", "--no-ff", "-m", gomock.Any(), prjPR.Head.Sha).Return(nil)
+
+				m.EXPECT().GitClone("pkg", "master", pkgPR.Base.Repo.SSHURL).Return("origin_pkg", nil)
+				m.EXPECT().GitExecOrPanic("pkg", "fetch", "origin_pkg", pkgPR.Head.Sha)
+				m.EXPECT().GitExecOrPanic("pkg", "checkout", "-B", "master", pkgPR.Head.Sha)
+				m.EXPECT().GitExecOrPanic("pkg", "push", "-f", "origin_pkg")
+				m.EXPECT().GitExecOrPanic("_ObsPrj", "push", "origin")
+			},
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			prjPR := &models.PullRequest{
+				Index: 1,
+				Base: &models.PRBranchInfo{
+					Name: "master",
+					Sha:  "prj_base_sha",
+					Repo: &models.Repository{
+						Owner:  &models.User{UserName: "org"},
+						Name:   "_ObsPrj",
+						SSHURL: "ssh://git@src.opensuse.org/org/_ObsPrj.git",
+					},
+				},
+				Head: &models.PRBranchInfo{
+					Sha: "prj_head_sha",
+				},
+			}
+			pkgPR := &models.PullRequest{
+				Index: 2,
+				Base: &models.PRBranchInfo{
+					Name: "master",
+					Sha:  "pkg_base_sha",
+					Repo: &models.Repository{
+						Owner:  &models.User{UserName: "org"},
+						Name:   "pkg",
+						SSHURL: "ssh://git@src.opensuse.org/org/pkg.git",
+					},
+				},
+				Head: &models.PRBranchInfo{
+					Sha: "pkg_head_sha",
+				},
+			}
+
+			ctl := gomock.NewController(t)
+			git := mock_common.NewMockGit(ctl)
+			reviewUnrequestMock := mock_common.NewMockGiteaReviewUnrequester(ctl)
+			reviewUnrequestMock.EXPECT().UnrequestReview(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes().Return(nil)
+
+			test.setup(git, prjPR, pkgPR)
+
+			prset := &common.PRSet{
+				Config: test.config,
+				PRs: []*common.PRInfo{
+					{PR: prjPR},
+					{PR: pkgPR},
+				},
+			}
+
+			if err := prset.Merge(reviewUnrequestMock, git); err != nil {
+				t.Errorf("Unexpected error: %v", err)
+			}
+		})
+	}
+}
+
+func TestPRAddMergeCommit(t *testing.T) {
+	pkgPR := &models.PullRequest{
+		Index: 2,
+		Base: &models.PRBranchInfo{
+			Name: "master",
+			Sha:  "pkg_base_sha",
+			Repo: &models.Repository{
+				Owner:  &models.User{UserName: "org"},
+				Name:   "pkg",
+				SSHURL: "ssh://git@src.opensuse.org/org/pkg.git",
+			},
+		},
+		Head: &models.PRBranchInfo{
+			Name: "branch_name",
+			Sha:  "pkg_head_sha",
+		},
+		AllowMaintainerEdit: true,
+	}
+
+	config := &common.AutogitConfig{
+		Organization:   "org",
+		GitProjectName: "org/_ObsPrj#master",
+		MergeMode:      common.MergeModeReplace,
+	}
+
+	ctl := gomock.NewController(t)
+	git := mock_common.NewMockGit(ctl)
+
+	git.EXPECT().GitExec("pkg", "merge", "--no-ff", "--no-commit", "-X", "theirs", pkgPR.Head.Sha).Return(nil)
+	git.EXPECT().GitExecOrPanic("pkg", "read-tree", "--reset", "-u", pkgPR.Head.Sha)
+	git.EXPECT().GitExecOrPanic("pkg", "commit", "-m", gomock.Any())
+	git.EXPECT().GitExecOrPanic("pkg", "push", "origin", "HEAD:branch_name")
+	git.EXPECT().GitExecWithOutputOrPanic("pkg", "rev-list", "-1", "HEAD").Return("new_head_sha")
+
+	prset := &common.PRSet{
+		Config: config,
+		PRs: []*common.PRInfo{
+			{PR: &models.PullRequest{}}, // prjgit at index 0
+			{PR: pkgPR},                 // pkg at index 1
+		},
+	}
+
+	if res := prset.AddMergeCommit(git, "origin", 1); !res {
+		t.Errorf("Expected true, got %v", res)
+	}
+}
+

common/reviews.go

@@ -8,32 +8,47 @@ import (
 	"src.opensuse.org/autogits/common/gitea-generated/models"
 )
 
+type ReviewInterface interface {
+	IsManualMergeOK() bool
+	IsApproved() bool
+	MisingReviews() []string
+	FindReviewRequester(reviewer string) *models.TimelineComment
+	HasPendingReviewBy(reviewer string) bool
+	IsReviewedBy(reviewer string) bool
+	IsReviewedByOneOf(reviewers ...string) bool
+
+	SetRequiredReviewers(reviewers []string)
+}
+
 type PRReviews struct {
 	Reviews            []*models.PullReview
-	RequestedReviewers []string
+	RequestedReviewers []*models.TimelineComment
 	Comments           []*models.TimelineComment
 
-	FullTimeline []*models.TimelineComment
+	RequiredReviewers []string
+}
+
+func (r *PRReviews) SetRequiredReviewers(reviewers []string) {
+	r.RequiredReviewers = reviewers
 }
 
 func FetchGiteaReviews(rf GiteaReviewTimelineFetcher, org, repo string, no int64) (*PRReviews, error) {
-	rawReviews, err := rf.GetPullRequestReviews(org, repo, no)
-	if err != nil {
-		return nil, err
-	}
-
 	timeline, err := rf.GetTimeline(org, repo, no)
 	if err != nil {
 		return nil, err
 	}
 
+	rawReviews, err := rf.GetPullRequestReviews(org, repo, no)
+	if err != nil {
+		return nil, err
+	}
 
 	reviews := make([]*models.PullReview, 0, 10)
-	needNewReviews := []string{}
 	var comments []*models.TimelineComment
 
+	var foundUsers []string
 	alreadyHaveUserReview := func(user string) bool {
-		if slices.Contains(needNewReviews, user) {
+		if slices.Contains(foundUsers, user) {
 			return true
 		}
 		for _, r := range reviews {
@@ -49,20 +64,24 @@ func FetchGiteaReviews(rf GiteaReviewTimelineFetcher, org, repo string, no int64
 	LogDebug("Number of items in timeline:", len(timeline))
 
 	cutOffIdx := len(timeline)
+	var PendingRequestedReviews []*models.TimelineComment
 	for idx, item := range timeline {
-		if item.Type == TimelineCommentType_Review || item.Type == TimelineCommentType_ReviewRequested {
+		if item.Type == TimelineCommentType_Review {
 			for _, r := range rawReviews {
-				if r.ID == item.ReviewID {
+				if r.ID == item.ReviewID && r.User != nil {
 					if !alreadyHaveUserReview(r.User.UserName) {
-						if item.Type == TimelineCommentType_Review && idx > cutOffIdx {
-							needNewReviews = append(needNewReviews, r.User.UserName)
-						} else {
+						if idx < cutOffIdx {
 							reviews = append(reviews, r)
 						}
+						foundUsers = append(foundUsers, r.User.UserName)
 					}
 					break
 				}
 			}
+		} else if item.Type == TimelineCommentType_ReviewRequested && item.Assignee != nil && !alreadyHaveUserReview(item.Assignee.UserName) {
+			PendingRequestedReviews = append(PendingRequestedReviews, item)
+		} else if item.Type == TimelineCommentType_DismissReview && item.Assignee != nil && !alreadyHaveUserReview(item.Assignee.UserName) {
+			foundUsers = append(foundUsers, item.Assignee.UserName)
 		} else if item.Type == TimelineCommentType_Comment && cutOffIdx > idx {
 			comments = append(comments, item)
 		} else if item.Type == TimelineCommentType_PushPull && cutOffIdx == len(timeline) {
@@ -75,9 +94,9 @@ func FetchGiteaReviews(rf GiteaReviewTimelineFetcher, org, repo string, no int64
 	LogDebug("num comments:", len(comments), "timeline:", len(reviews))
 
 	return &PRReviews{
-		Reviews:      reviews,
-		Comments:     comments,
-		FullTimeline: timeline,
+		Reviews:            reviews,
+		Comments:           comments,
+		RequestedReviewers: PendingRequestedReviews,
 	}, nil
 }
 
@@ -105,7 +124,7 @@ func (r *PRReviews) IsManualMergeOK() bool {
 			continue
 		}
 		LogDebug("comment:", c.User.UserName, c.Body)
-		if slices.Contains(r.RequestedReviewers, c.User.UserName) {
+		if slices.Contains(r.RequiredReviewers, c.User.UserName) {
 			if bodyCommandManualMergeOK(c.Body) {
 				return true
 			}
@@ -116,7 +135,7 @@ func (r *PRReviews) IsManualMergeOK() bool {
 		if c.Updated != c.Submitted {
 			continue
 		}
-		if slices.Contains(r.RequestedReviewers, c.User.UserName) {
+		if slices.Contains(r.RequiredReviewers, c.User.UserName) {
 			if bodyCommandManualMergeOK(c.Body) {
 				return true
 			}
@@ -132,7 +151,7 @@ func (r *PRReviews) IsApproved() bool {
 	}
 	goodReview := true
 
-	for _, reviewer := range r.RequestedReviewers {
+	for _, reviewer := range r.RequiredReviewers {
 		goodReview = false
 		for _, review := range r.Reviews {
 			if review.User.UserName == reviewer && review.State == ReviewStateApproved && !review.Stale && !review.Dismissed {
@@ -156,7 +175,7 @@ func (r *PRReviews) MissingReviews() []string {
 		return missing
 	}
 
-	for _, reviewer := range r.RequestedReviewers {
+	for _, reviewer := range r.RequiredReviewers {
 		if !r.IsReviewedBy(reviewer) {
 			missing = append(missing, reviewer)
 		}
@@ -169,12 +188,11 @@ func (r *PRReviews) FindReviewRequester(reviewer string) *models.TimelineComment
 		return nil
 	}
 
-	for _, r := range r.FullTimeline {
-		if r.Type == TimelineCommentType_ReviewRequested && r.Assignee.UserName == reviewer {
-			return r
+	for _, t := range r.RequestedReviewers {
+		if t.Assignee.UserName == reviewer {
+			return t
 		}
 	}
-
 	return nil
 }
 
@@ -188,10 +206,19 @@ func (r *PRReviews) HasPendingReviewBy(reviewer string) bool {
 			switch r.State {
 			case ReviewStateRequestReview, ReviewStatePending:
 				return true
+			default:
+				return false
 			}
 		}
 	}
 
+	// at this point, we do not have actual review by user. Check if we have a pending review
+	for _, t := range r.RequestedReviewers {
+		if t.Assignee != nil && t.Assignee.UserName == reviewer {
+			return true
+		}
+	}
+
 	return false
 }
 
@@ -200,20 +227,18 @@ func (r *PRReviews) IsReviewedBy(reviewer string) bool {
 		return false
 	}
 
-	res := false
-
-	for _, i := range r.Reviews {
-		if i.User.UserName == reviewer && !i.Stale {
-			switch i.State {
+	for _, r := range r.Reviews {
+		if r.User.UserName == reviewer && !r.Stale {
+			switch r.State {
 			case ReviewStateApproved, ReviewStateRequestChanges:
-				res = true
-			case ReviewStateRequestReview, ReviewStatePending:
+				return true
+			default:
 				return false
 			}
 		}
 	}
 
-	return res
+	return false
 }
 
 func (r *PRReviews) IsReviewedByOneOf(reviewers ...string) bool {

common/reviews_test.go

@@ -137,6 +137,61 @@ func TestReviews(t *testing.T) {
 			isApproved:        false,
 			isReviewedByTest1: true,
 		},
+		{
+			name: "Ghost user review",
+			reviews: []*models.PullReview{
+				{State: common.ReviewStateApproved, User: nil},
+			},
+			reviewers:  []string{"user1"},
+			isApproved: false,
+		},
+		{
+			name:    "ReviewRequested predates PushPull should be seen as pending",
+			reviews: []*models.PullReview{},
+			timeline: []*models.TimelineComment{
+				{Type: common.TimelineCommentType_PushPull},
+				{Type: common.TimelineCommentType_ReviewRequested, Assignee: &models.User{UserName: "user1"}},
+			},
+			reviewers:        []string{"user1"},
+			isPendingByTest1: true,
+		},
+		{
+			name:    "ReviewRequested postdates PushPull but blocked by older dismiss",
+			reviews: []*models.PullReview{},
+			timeline: []*models.TimelineComment{
+				{Type: common.TimelineCommentType_ReviewRequested, Assignee: &models.User{UserName: "user1"}},
+				{Type: common.TimelineCommentType_PushPull},
+				{Type: common.TimelineCommentType_ReviewDismissed, Assignee: &models.User{UserName: "user1"}},
+			},
+			reviewers:        []string{"user1"},
+			isPendingByTest1: true,
+		},
+		{
+			name: "ReviewRequested predates PushPull should be seen as pending",
+			reviews: []*models.PullReview{
+				{ID: 101, State: common.ReviewStateRequestReview, User: &models.User{UserName: "user1"}},
+			},
+			timeline: []*models.TimelineComment{
+				{Type: common.TimelineCommentType_PushPull},
+				{Type: common.TimelineCommentType_ReviewRequested, Assignee: &models.User{UserName: "user1"}},
+			},
+			reviewers:        []string{"user1"},
+			isPendingByTest1: true,
+		},
+		{
+			name: "Review requested, review, then push needs re-requesting",
+			reviews: []*models.PullReview{
+				{ID: 100, State: common.ReviewStateRequestChanges, User: &models.User{UserName: "user1"}},
+			},
+			timeline: []*models.TimelineComment{
+				{Type: common.TimelineCommentType_PushPull},
+				{Type: common.TimelineCommentType_Review, ReviewID: 100},
+				{Type: common.TimelineCommentType_ReviewRequested, Assignee: &models.User{UserName: "user1"}},
+			},
+			reviewers:         []string{"user1"},
+			isReviewedByTest1: false, // Should be stale
+			isPendingByTest1:  false, // Should be stale
+		},
 	}
 
 	for _, test := range tests {
@@ -158,7 +213,7 @@ func TestReviews(t *testing.T) {
 				}
 				return
 			}
-			reviews.RequestedReviewers = test.reviewers
+			reviews.SetRequiredReviewers(test.reviewers)
 
 			if r := reviews.IsApproved(); r != test.isApproved {
 				t.Fatal("Unexpected IsReviewed():", r, "vs. expected", test.isApproved)

common/timeline.go

@@ -8,6 +8,7 @@ import (
 )
 
 const (
+	TimelineCommentType_ReviewDismissed = "dismiss_review"
 	TimelineCommentType_ReviewRequested = "review_request"
 	TimelineCommentType_Review          = "review"
 	TimelineCommentType_PushPull        = "pull_push"

gitea-events-rabbitmq-publisher/rabbitmq.go

@@ -92,10 +92,13 @@ func ConnectToExchangeForPublish(host, username, password string) {
 		auth = username + ":" + password + "@"
 	}
 
-	connection, err := rabbitmq.DialTLS("amqps://"+auth+host, &tls.Config{
-		ServerName: host,
+	connection, err := rabbitmq.DialConfig("amqps://"+auth+host, rabbitmq.Config{
+		Dial: rabbitmq.DefaultDial(10 * time.Second),
+		TLSClientConfig: &tls.Config{
+			ServerName: host,
+		},
 	})
-	failOnError(err, "Cannot connect to rabbit.opensuse.org")
+	failOnError(err, "Cannot connect to "+host)
 	defer connection.Close()
 
 	ch, err := connection.Channel()

integration/Dockerfile.tester

@@ -4,7 +4,7 @@ ENV container=podman
 
 ENV LANG=en_US.UTF-8
 
-RUN zypper -vvvn install podman podman-compose vim make python3-pytest python3-requests python3-pytest-dependency
+RUN zypper -vvvn install podman podman-compose vim make python3-pytest python3-requests python3-pytest-dependency python3-pytest-httpserver
 
 COPY . /opt/project/
 

integration/Makefile

@@ -1,51 +1,19 @@
-# We want to be able to test in two **modes**:
-# A. bots are used from official packages as defined in */Dockerfile.package
-# B. bots are just picked up from binaries that are placed in corresponding parent directory.
-
 # The topology is defined in podman-compose file and can be spawned in two ways:
-# 1. Privileged container (needs no additional dependancies)
-# 2. podman-compose on a local machine (needs dependencies as defined in the Dockerfile)
-
+# 1. podman-compose on a local machine (needs dependencies as defined in the Dockerfile)
+# 2. pytest in a dedicated container (recommended)
 
 # Typical workflow:
-# A1: - run 'make test_package'
-# B1: - run 'make test_local' (make sure that the go binaries in parent folder are built)
-# A2:
-#   1. 'make build_package' - prepares images (recommended, otherwise there might be surprises if image fails to build during `make up`)
-#   2. 'make up' - spawns podman-compose
-#   3. 'pytest -v tests/*' - run tests
-#   4. 'make down' - once the containers are not needed
-# B2: (make sure the go binaries in the parent folder are built)
-#   1. 'make build_local' - prepared images (recommended, otherwise there might be surprises if image fails to build during `make up`)
-#   2. 'make up' - spawns podman-compose
-#   3. 'pytest -v tests/*' - run tests
-#   4. 'make down' - once the containers are not needed
-
+# 1. 'make build' - prepares images
+# 2. 'make up' - spawns podman-compose
+# 3. 'make pytest' - run tests inside the tester container
+# 4. 'make down' - once the containers are not needed
+#
+# OR just run 'make test' to do it all at once.
 
 AUTO_DETECT_MODE := $(shell if test -e ../workflow-pr/workflow-pr; then echo .local; else echo .package; fi) 
 
-# try to detect mode B1, otherwise mode A1
-test: GIWTF_IMAGE_SUFFIX=$(AUTO_DETECT_MODE)
-test: build_container test_container
-
-# mode A1
-test_package: GIWTF_IMAGE_SUFFIX=.package
-test_package: build_container test_container
-
-# mode B1
-test_local: GIWTF_IMAGE_SUFFIX=.local
-test_local: build_container test_container
-
-MODULES := gitea-events-rabbitmq-publisher obs-staging-bot workflow-pr
-
-# Prepare topology 1
-build_container:
-	podman build ../ -f integration/Dockerfile -t autogits_integration
-
-# Run tests in topology 1
-test_container:
-	podman run --rm --privileged -t -e GIWTF_IMAGE_SUFFIX=$(GIWTF_IMAGE_SUFFIX) autogits_integration /usr/bin/bash -c "make build && make up && sleep 25 && pytest -v tests/*"
-
+# Default test target
+test: test_b
 
 build_local: AUTO_DETECT_MODE=.local
 build_local: build
@@ -53,16 +21,66 @@ build_local: build
 build_package: AUTO_DETECT_MODE=.package
 build_package: build
 
-# parse all service images from podman-compose and build them (topology 2)
+# parse all service images from podman-compose and build them
+# mode B with pytest in container
+test_b: AUTO_DETECT_MODE=.local
+test_b: build up wait_healthy pytest
+
+# Complete cycle for CI
+test-ci: test_b down
+
+wait_healthy:
+	@echo "Waiting for services to be healthy..."
+	@echo "Waiting for gitea (max 2m)..."
+	@start_time=$$(date +%s); \
+	until podman exec gitea-test curl -f -s http://localhost:3000/api/v1/version >/dev/null 2>&1; do \
+		current_time=$$(date +%s); \
+		elapsed=$$((current_time - start_time)); \
+		if [ $$elapsed -gt 120 ]; then \
+			echo "ERROR: Gitea failed to start within 2 minutes."; \
+			echo "--- Troubleshooting Info ---"; \
+			echo "Diagnostics output (curl):"; \
+			podman exec gitea-test curl -v http://localhost:3000/api/v1/version || true; \
+			echo "--- Container Logs ---"; \
+			podman logs gitea-test --tail 20; \
+			echo "--- Container Status ---"; \
+			podman inspect gitea-test --format '{{.State.Status}}'; \
+			exit 1; \
+		fi; \
+		sleep 2; \
+	done
+	@echo "Waiting for rabbitmq (max 2m)..."
+	@start_time=$$(date +%s); \
+	until podman exec rabbitmq-test rabbitmq-diagnostics check_running -q >/dev/null 2>&1; do \
+		current_time=$$(date +%s); \
+		elapsed=$$((current_time - start_time)); \
+		if [ $$elapsed -gt 120 ]; then \
+			echo "ERROR: RabbitMQ failed to start within 2 minutes."; \
+			echo "--- Troubleshooting Info ---"; \
+			echo "Diagnostics output:"; \
+			podman exec rabbitmq-test rabbitmq-diagnostics check_running || true; \
+			echo "--- Container Logs ---"; \
+			podman logs rabbitmq-test --tail 20; \
+			echo "--- Container Status ---"; \
+			podman inspect rabbitmq-test --format '{{.State.Status}}'; \
+			exit 1; \
+		fi; \
+		sleep 2; \
+	done
+	@echo "All services are healthy!"
+
+pytest:
+	podman-compose exec tester pytest -v tests/*
+
 build:
 	podman pull docker.io/library/rabbitmq:3.13.7-management
 	for i in $$(grep -A 1000 services: podman-compose.yml | grep -oE '^  [^: ]+'); do GIWTF_IMAGE_SUFFIX=$(AUTO_DETECT_MODE) podman-compose build $$i || exit 1; done
 
-# this will spawn prebuilt containers (topology 2)
+# this will spawn prebuilt containers
 up:
 	podman-compose up -d
 
-# tear down (topology 2) 
+# tear down
 down:
 	podman-compose down
 
@@ -73,4 +91,3 @@ up-bots-package:
 # mode B
 up-bots-local:
 	GIWTF_IMAGE_SUFFIX=.local podman-compose up -d
-

integration/Makefile.md

@@ -0,0 +1,52 @@
+# Makefile Targets
+
+This document describes the targets available in the `integration/Makefile`.
+
+## Primary Workflow
+
+### `test` (or `test_b`)
+- **Action**: Performs a complete build-and-test cycle.
+- **Steps**:
+    1. `build`: Prepares all container images.
+    2. `up`: Starts all services via `podman-compose`.
+    3. `wait_healthy`: Polls Gitea and RabbitMQ until they are ready.
+    4. `pytest`: Executes the test suite inside the `tester` container.
+- **Outcome**: The environment remains active for fast iteration.
+
+### `test-ci`
+- **Action**: Performs the full `test` cycle followed by teardown.
+- **Steps**: `test_b` -> `down`
+- **Purpose**: Ideal for CI environments where a clean state is required after testing.
+
+---
+
+## Individual Targets
+
+### `build`
+- **Action**: Pulls external images (RabbitMQ) and builds all local service images defined in `podman-compose.yml`.
+- **Note**: Use `build_local` or `build_package` to specify bot source mode.
+
+### `up`
+- **Action**: Starts the container topology in detached mode.
+
+### `wait_healthy`
+- **Action**: Polls the health status of `gitea-test` and `rabbitmq-test` containers.
+- **Purpose**: Ensures infrastructure is stable before test execution.
+
+### `pytest`
+- **Action**: Runs `pytest -v tests/*` inside the running `tester` container.
+- **Requirement**: The environment must already be started via `up`.
+
+### `down`
+- **Action**: Stops and removes all containers and networks defined in the compose file.
+
+---
+
+## Configuration Modes
+
+The Makefile supports two deployment modes via `GIWTF_IMAGE_SUFFIX`:
+
+- **.local** (Default): Uses binaries built from the local source (requires `make build` in project root).
+- **.package**: Uses official pre-built packages for the bots.
+
+Targets like `build_local`, `build_package`, `up-bots-local`, and `up-bots-package` allow for explicit mode selection.

integration/Makefile.txt

@@ -1,57 +0,0 @@
-+-------------------------------------------------------------------------------------------------+
-|                                         Makefile Targets                                        |
-+-------------------------------------------------------------------------------------------------+
-|                                                                                                 |
-|  [Default Test Workflow]                                                                        |
-|  test (Auto-detects mode: .local or .package)                                                   |
-|    └─> build_container                                                                          |
-|    └─> test_container                                                                           |
-|                                                                                                 |
-|  [Specific Test Workflows - Topology 1: Privileged Container]                                   |
-|  test_package (Mode A1: Bots from official packages)                                            |
-|    └─> build_container                                                                          |
-|    └─> test_container                                                                           |
-|                                                                                                 |
-|  test_local (Mode B1: Bots from local binaries)                                                 |
-|    └─> build_container                                                                          |
-|    └─> test_container                                                                           |
-|                                                                                                 |
-|  build_container                                                                                |
-|    - Action: Builds the `autogits_integration` privileged container image.                      |
-|    - Purpose: Prepares an environment for running tests within a single container.              |
-|                                                                                                 |
-|  test_container                                                                                 |
-|    - Action: Runs `autogits_integration` container, executes `make build`, `make up`, and       |
-|              `pytest -v tests/*` inside it.                                                     |
-|    - Purpose: Executes the full test suite in Topology 1 (privileged container).                |
-|                                                                                                 |
-|  [Build & Orchestration Workflows - Topology 2: podman-compose]                                 |
-|                                                                                                 |
-|  build_package (Mode A: Builds service images from official packages)                           |
-|    └─> build                                                                                    |
-|                                                                                                 |
-|  build_local (Mode B: Builds service images from local binaries)                                |
-|    └─> build                                                                                    |
-|                                                                                                 |
-|  build                                                                                          |
-|    - Action: Pulls `rabbitmq` image and iterates through `podman-compose.yml` services          |
-|              to build each one.                                                                 |
-|    - Purpose: Prepares all necessary service images for Topology 2 deployment.                  |
-|                                                                                                 |
-|  up                                                                                             |
-|    - Action: Starts all services defined in `podman-compose.yml` in detached mode.              |
-|    - Purpose: Deploys the application topology (containers) for testing or development.         |
-|                                                                                                 |
-|  down                                                                                           |
-|    - Action: Stops and removes all services started by `up`.                                    |
-|    - Purpose: Cleans up the deployed application topology.                                      |
-|                                                                                                 |
-|  up-bots-package (Mode A: Spawns Topology 2 with official package bots)                         |
-|    - Action: Calls `podman-compose up -d` with `GIWTF_IMAGE_SUFFIX=.package`.                   |
-|    - Purpose: Specifically brings up the environment using official package bots.               |
-|                                                                                                 |
-|  up-bots-local (Mode B: Spawns Topology 2 with local binaries)                                  |
-|    - Action: Calls `podman-compose up -d` with `GIWTF_IMAGE_SUFFIX=.local`.                     |
-|    - Purpose: Specifically brings up the environment using local binaries.                      |
-|                                                                                                 |
-+-------------------------------------------------------------------------------------------------+

integration/mock-obs/Dockerfile

@@ -1,14 +0,0 @@
-# Use a base Python image
-FROM registry.suse.com/bci/python:3.11
-
-# Set the working directory
-WORKDIR /app
-
-# Copy the server script
-COPY server.py .
-
-# Expose the port the server will run on
-EXPOSE 8080
-
-# Command to run the server
-CMD ["python3", "-u", "server.py"]

integration/mock-obs/responses/GET_source_openSUSE:Leap:16.0:PullRequest__meta

@@ -1,18 +0,0 @@
-<project name="openSUSE:Leap:16.0:PullRequest">
-  <title>Leap 16.0 PullRequest area</title>
-  <description>Base project to define the pull request builds</description>
-  <person userid="autogits_obs_staging_bot" role="maintainer"/>
-  <person userid="maxlin_factory" role="maintainer"/>
-  <group groupid="maintenance-opensuse.org" role="maintainer"/>
-  <debuginfo>
-    <enable/>
-  </debuginfo>
-  <repository name="standard">
-    <path project="openSUSE:Leap:16.0" repository="standard"/>
-    <arch>x86_64</arch>
-    <arch>i586</arch>
-    <arch>aarch64</arch>
-    <arch>ppc64le</arch>
-    <arch>s390x</arch>
-  </repository>
-</project>

integration/mock-obs/responses/GET_source_openSUSE:Leap:16.0__meta

@@ -1,59 +0,0 @@
-<project name="openSUSE:Leap:16.0">
-  <title>openSUSE Leap 16.0 based on SLFO</title>
-  <description>Leap 16.0 based on SLES 16.0 (specifically SLFO:1.2)</description>
-  <link project="openSUSE:Backports:SLE-16.0"/>
-  <scmsync>http://gitea-test:3000/products/SLFO#main</scmsync>
-  <person userid="dimstar_suse" role="maintainer"/>
-  <person userid="lkocman-factory" role="maintainer"/>
-  <person userid="maxlin_factory" role="maintainer"/>
-  <person userid="factory-auto" role="reviewer"/>
-  <person userid="licensedigger" role="reviewer"/>
-  <group groupid="autobuild-team" role="maintainer"/>
-  <group groupid="factory-maintainers" role="maintainer"/>
-  <group groupid="maintenance-opensuse.org" role="maintainer"/>
-  <group groupid="factory-staging" role="reviewer"/>
-  <build>
-    <disable repository="ports"/>
-  </build>
-  <debuginfo>
-    <enable/>
-  </debuginfo>
-  <repository name="standard" rebuild="local">
-    <path project="openSUSE:Backports:SLE-16.0" repository="standard"/>
-    <path project="SUSE:SLFO:1.2" repository="standard"/>
-    <arch>local</arch>
-    <arch>i586</arch>
-    <arch>x86_64</arch>
-    <arch>aarch64</arch>
-    <arch>ppc64le</arch>
-    <arch>s390x</arch>
-  </repository>
-  <repository name="product">
-    <releasetarget project="openSUSE:Leap:16.0:ToTest" repository="product" trigger="manual"/>
-    <path project="openSUSE:Leap:16.0:NonFree" repository="standard"/>
-    <path project="openSUSE:Leap:16.0" repository="images"/>
-    <path project="openSUSE:Leap:16.0" repository="standard"/>
-    <path project="openSUSE:Backports:SLE-16.0" repository="standard"/>
-    <path project="SUSE:SLFO:1.2" repository="standard"/>
-    <arch>local</arch>
-    <arch>i586</arch>
-    <arch>x86_64</arch>
-    <arch>aarch64</arch>
-    <arch>ppc64le</arch>
-    <arch>s390x</arch>
-  </repository>
-  <repository name="ports">
-    <arch>armv7l</arch>
-  </repository>
-  <repository name="images">
-    <releasetarget project="openSUSE:Leap:16.0:ToTest" repository="images" trigger="manual"/>
-    <path project="openSUSE:Leap:16.0" repository="standard"/>
-    <path project="openSUSE:Backports:SLE-16.0" repository="standard"/>
-    <path project="SUSE:SLFO:1.2" repository="standard"/>
-    <arch>i586</arch>
-    <arch>x86_64</arch>
-    <arch>aarch64</arch>
-    <arch>ppc64le</arch>
-    <arch>s390x</arch>
-  </repository>
-</project>

integration/mock-obs/server.py

@@ -1,140 +0,0 @@
-import http.server
-import socketserver
-import os
-import logging
-import signal
-import sys
-import threading
-import fnmatch
-
-PORT = 8080
-RESPONSE_DIR = "/app/responses"
-STATE_DIR = "/tmp/mock_obs_state"
-
-class MockOBSHandler(http.server.SimpleHTTPRequestHandler):
-    def do_GET(self):
-        logging.info(f"GET request for: {self.path}")
-        path_without_query = self.path.split('?')[0]
-        
-        # Check for state stored by a PUT request first
-        sanitized_put_path = 'PUT' + path_without_query.replace('/', '_')
-        state_file_path = os.path.join(STATE_DIR, sanitized_put_path)
-        if os.path.exists(state_file_path):
-            logging.info(f"Found stored PUT state for {self.path} at {state_file_path}")
-            self.send_response(200)
-            self.send_header("Content-type", "application/xml")
-            file_size = os.path.getsize(state_file_path)
-            self.send_header("Content-Length", str(file_size))
-            self.end_headers()
-            with open(state_file_path, 'rb') as f:
-                self.wfile.write(f.read())
-            return
-
-        # If no PUT state file, fall back to the glob/exact match logic
-        self.handle_request('GET')
-
-    def do_PUT(self):
-        logging.info(f"PUT request for: {self.path}")
-        logging.info(f"Headers: {self.headers}")
-        path_without_query = self.path.split('?')[0]
-        
-        body = b''
-        if self.headers.get('Transfer-Encoding', '').lower() == 'chunked':
-            logging.info("Chunked transfer encoding detected")
-            while True:
-                line = self.rfile.readline().strip()
-                if not line:
-                    break
-                chunk_length = int(line, 16)
-                if chunk_length == 0:
-                    self.rfile.readline()
-                    break
-                body += self.rfile.read(chunk_length)
-                self.rfile.read(2)  # Read the trailing CRLF
-        else:
-            content_length = int(self.headers.get('Content-Length', 0))
-            body = self.rfile.read(content_length)
-
-        logging.info(f"Body: {body.decode('utf-8')}")
-        sanitized_path = 'PUT' + path_without_query.replace('/', '_')
-        state_file_path = os.path.join(STATE_DIR, sanitized_path)
-
-        logging.info(f"Saving state for {self.path} to {state_file_path}")
-        os.makedirs(os.path.dirname(state_file_path), exist_ok=True)
-        with open(state_file_path, 'wb') as f:
-            f.write(body)
-
-        self.send_response(200)
-        self.send_header("Content-type", "text/plain")
-        response_body = b"OK"
-        self.send_header("Content-Length", str(len(response_body)))
-        self.end_headers()
-        self.wfile.write(response_body)
-
-    def do_POST(self):
-        logging.info(f"POST request for: {self.path}")
-        self.handle_request('POST')
-    
-    def do_DELETE(self):
-        logging.info(f"DELETE request for: {self.path}")
-        self.handle_request('DELETE')
-
-    def handle_request(self, method):
-        path_without_query = self.path.split('?')[0]
-        sanitized_request_path = method + path_without_query.replace('/', '_')
-        logging.info(f"Handling request, looking for match for: {sanitized_request_path}")
-        
-        response_file = None
-        # Check for glob match first
-        if os.path.exists(RESPONSE_DIR):
-            for filename in os.listdir(RESPONSE_DIR):
-                if fnmatch.fnmatch(sanitized_request_path, filename):
-                    response_file = os.path.join(RESPONSE_DIR, filename)
-                    logging.info(f"Found matching response file (glob): {response_file}")
-                    break
-        
-        # Fallback to exact match if no glob match
-        if response_file is None:
-            exact_file = os.path.join(RESPONSE_DIR, sanitized_request_path)
-            if os.path.exists(exact_file):
-                response_file = exact_file
-                logging.info(f"Found matching response file (exact): {response_file}")
-
-        if response_file:
-            logging.info(f"Serving content from {response_file}")
-            self.send_response(200)
-            self.send_header("Content-type", "application/xml")
-            file_size = os.path.getsize(response_file)
-            self.send_header("Content-Length", str(file_size))
-            self.end_headers()
-            with open(response_file, 'rb') as f:
-                self.wfile.write(f.read())
-        else:
-            logging.info(f"Response file not found for {sanitized_request_path}. Sending 404.")
-            self.send_response(404)
-            self.send_header("Content-type", "text/plain")
-            body = f"Mock response not found for {sanitized_request_path}".encode('utf-8')
-            self.send_header("Content-Length", str(len(body)))
-            self.end_headers()
-            self.wfile.write(body)
-
-if __name__ == "__main__":
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(message)s')
-    
-    if not os.path.exists(STATE_DIR):
-        logging.info(f"Creating state directory: {STATE_DIR}")
-        os.makedirs(STATE_DIR)
-    if not os.path.exists(RESPONSE_DIR):
-        os.makedirs(RESPONSE_DIR)
-        
-    with socketserver.TCPServer(("", PORT), MockOBSHandler) as httpd:
-        logging.info(f"Serving mock OBS API on port {PORT}")
-
-        def graceful_shutdown(sig, frame):
-            logging.info("Received SIGTERM, shutting down gracefully...")
-            threading.Thread(target=httpd.shutdown).start()
-
-        signal.signal(signal.SIGTERM, graceful_shutdown)
-
-        httpd.serve_forever()
-        logging.info("Server has shut down.")

integration/podman-compose.md

@@ -0,0 +1,64 @@
+# Podman-Compose Services Architecture
+
+This document describes the services defined in `podman-compose.yml` used for integration testing.
+
+## Network
+- **gitea-network**: A bridge network that enables communication between all services.
+
+## Services
+
+### gitea
+- **Description**: Self-hosted Git service, serving as the central hub for repositories.
+- **Container Name**: `gitea-test`
+- **Image**: Built from `./gitea/Dockerfile`
+- **Ports**: `3000` (HTTP), `3022` (SSH)
+- **Volumes**: `./gitea-data` (persistent data), `./gitea-logs` (logs)
+- **Healthcheck**: Monitors the Gitea API version endpoint.
+
+### rabbitmq
+- **Description**: Message broker for asynchronous communication between services.
+- **Container Name**: `rabbitmq-test`
+- **Image**: `rabbitmq:3.13.7-management`
+- **Ports**: `5671` (AMQP with TLS), `15672` (Management UI)
+- **Volumes**: `./rabbitmq-data`, `./rabbitmq-config/certs`, `./rabbitmq-config/rabbitmq.conf`, `./rabbitmq-config/definitions.json`
+- **Healthcheck**: Ensures the broker is running and ready to accept connections.
+
+### gitea-publisher
+- **Description**: Publishes events from Gitea webhooks to the RabbitMQ message queue.
+- **Container Name**: `gitea-publisher`
+- **Dependencies**: `gitea` (started), `rabbitmq` (healthy)
+- **Topic Domain**: `suse`
+
+### workflow-pr
+- **Description**: Manages pull request workflows, synchronizing between ProjectGit and PackageGit.
+- **Container Name**: `workflow-pr`
+- **Dependencies**: `gitea` (started), `rabbitmq` (healthy)
+- **Environment**: Configured via `AUTOGITS_*` variables.
+- **Volumes**: `./gitea-data` (read-only), `./workflow-pr/workflow-pr.json` (config), `./workflow-pr-repos` (working directories)
+
+### tester
+- **Description**: The dedicated test runner container. It hosts the `pytest` suite and provides a mock OBS API using `pytest-httpserver`.
+- **Container Name**: `tester`
+- **Image**: Built from `./Dockerfile.tester`
+- **Mock API**: Listens on port `8080` within the container network to simulate OBS.
+- **Volumes**: Project root mounted at `/opt/project` for source access.
+
+### obs-staging-bot
+- **Description**: Interacts with Gitea and the OBS API (mocked by `tester`) to manage staging projects.
+- **Container Name**: `obs-staging-bot`
+- **Dependencies**: `gitea` (started), `tester` (started)
+- **Environment**: 
+    - `AUTOGITS_STAGING_BOT_POLL_INTERVAL`: Set to `2s` for fast integration testing.
+- **Mock Integration**: Points to `http://tester:8080` for both OBS API and Web hosts.
+
+---
+
+## Testing Workflow
+
+1.  **Build**: `make build` (root) then `make build` (integration).
+2.  **Up**: `make up` starts all services.
+3.  **Wait**: `make wait_healthy` ensures infrastructure is ready.
+4.  **Test**: `make pytest` runs the suite inside the `tester` container.
+5.  **Down**: `make down` stops and removes containers.
+
+Use `make test` to perform steps 1-4 automatically.

integration/podman-compose.txt

@@ -1,77 +0,0 @@
-+-------------------------------------------------------------------------------------------------+
-|                                    Podman-Compose Services Diagram                              |
-+-------------------------------------------------------------------------------------------------+
-|                                                                                                 |
-|  [Network]                                                                                      |
-|  gitea-network (Bridge network for inter-service communication)                                 |
-|                                                                                                 |
-|-------------------------------------------------------------------------------------------------|
-|                                                                                                 |
-|  [Service: gitea]                                                                               |
-|  Description: Self-hosted Git service, central hub for repositories and code management.        |
-|  Container Name: gitea-test                                                                     |
-|  Image: Built from ./gitea Dockerfile                                                           |
-|  Ports: 3000 (HTTP), 3022 (SSH)                                                                 |
-|  Volumes: ./gitea-data (for persistent data), ./gitea-logs (for logs)                           |
-|  Network: gitea-network                                                                         |
-|                                                                                                 |
-|-------------------------------------------------------------------------------------------------|
-|                                                                                                 |
-|  [Service: rabbitmq]                                                                            |
-|  Description: Message broker for asynchronous communication between services.                   |
-|  Container Name: rabbitmq-test                                                                  |
-|  Image: rabbitmq:3.13.7-management                                                              |
-|  Ports: 5671 (AMQP), 15672 (Management UI)                                                      |
-|  Volumes: ./rabbitmq-data (for persistent data), ./rabbitmq-config/certs (TLS certs),           |
-|           ./rabbitmq-config/rabbitmq.conf (config), ./rabbitmq-config/definitions.json (exchanges)|
-|  Healthcheck: Ensures RabbitMQ is running and healthy.                                          |
-|  Network: gitea-network                                                                         |
-|                                                                                                 |
-|-------------------------------------------------------------------------------------------------|
-|                                                                                                 |
-|  [Service: gitea-publisher]                                                                     |
-|  Description: Publishes events from Gitea to the RabbitMQ message queue.                        |
-|  Container Name: gitea-publisher                                                                |
-|  Image: Built from ../gitea-events-rabbitmq-publisher/Dockerfile (local/package)                |
-|  Dependencies: gitea (started), rabbitmq (healthy)                                              |
-|  Environment: RABBITMQ_HOST, RABBITMQ_USERNAME, RABBITMQ_PASSWORD, SSL_CERT_FILE                 |
-|  Command: Listens for Gitea events, publishes to 'suse' topic, debug enabled.                   |
-|  Network: gitea-network                                                                         |
-|                                                                                                 |
-|-------------------------------------------------------------------------------------------------|
-|                                                                                                 |
-|  [Service: workflow-pr]                                                                         |
-|  Description: Manages pull request workflows, likely consuming events from RabbitMQ and         |
-|               interacting with Gitea.                                                           |
-|  Container Name: workflow-pr                                                                    |
-|  Image: Built from ../workflow-pr/Dockerfile (local/package)                                    |
-|  Dependencies: gitea (started), rabbitmq (healthy)                                              |
-|  Environment: AMQP_USERNAME, AMQP_PASSWORD, SSL_CERT_FILE                                       |
-|  Volumes: ./gitea-data (read-only), ./workflow-pr/workflow-pr.json (config),                    |
-|           ./workflow-pr-repos (for repositories)                                                |
-|  Command: Configures Gitea/RabbitMQ URLs, enables debug, manages repositories.                  |
-|  Network: gitea-network                                                                         |
-|                                                                                                 |
-|-------------------------------------------------------------------------------------------------|
-|                                                                                                 |
-|  [Service: mock-obs]                                                                            |
-|  Description: A mock (simulated) service for the Open Build Service (OBS) for testing.          |
-|  Container Name: mock-obs                                                                       |
-|  Image: Built from ./mock-obs Dockerfile                                                        |
-|  Ports: 8080                                                                                    |
-|  Volumes: ./mock-obs/responses (for mock API responses)                                         |
-|  Network: gitea-network                                                                         |
-|                                                                                                 |
-|-------------------------------------------------------------------------------------------------|
-|                                                                                                 |
-|  [Service: obs-staging-bot]                                                                     |
-|  Description: A bot that interacts with Gitea and the mock OBS, likely for staging processes.   |
-|  Container Name: obs-staging-bot                                                                |
-|  Image: Built from ../obs-staging-bot/Dockerfile (local/package)                                |
-|  Dependencies: gitea (started), mock-obs (started)                                              |
-|  Environment: OBS_USER, OBS_PASSWORD                                                            |
-|  Volumes: ./gitea-data (read-only)                                                              |
-|  Command: Configures Gitea/OBS URLs, enables debug.                                             |
-|  Network: gitea-network                                                                         |
-|                                                                                                 |
-+-------------------------------------------------------------------------------------------------+

integration/podman-compose.yml

@@ -8,6 +8,7 @@ services:
   gitea:
     build: ./gitea
     container_name: gitea-test
+    init: true
     environment:
       - GITEA_WORK_DIR=/var/lib/gitea
     networks:
@@ -27,11 +28,7 @@ services:
   rabbitmq:
     image: rabbitmq:3.13.7-management
     container_name: rabbitmq-test
-    healthcheck:
-      test: ["CMD", "rabbitmq-diagnostics", "check_running", "-q"]
-      interval: 30s
-      timeout: 30s
-      retries: 3
+    init: true
     networks:
       - gitea-network
     ports:
@@ -55,6 +52,7 @@ services:
       context: ..
       dockerfile: integration/gitea-events-rabbitmq-publisher/Dockerfile${GIWTF_IMAGE_SUFFIX}
     container_name: gitea-publisher
+    init: true
     networks:
       - gitea-network
     depends_on:
@@ -75,6 +73,7 @@ services:
       context: ..
       dockerfile: integration/workflow-pr/Dockerfile${GIWTF_IMAGE_SUFFIX}
     container_name: workflow-pr
+    init: true
     networks:
       - gitea-network
     depends_on:
@@ -100,37 +99,44 @@ services:
     ]
     restart: unless-stopped
 
-  mock-obs:
-    build: ./mock-obs
-    container_name: mock-obs
+  tester:
+    build:
+      context: .
+      dockerfile: Dockerfile.tester
+    container_name: tester
+    init: true
+    dns_search: .
     networks:
       - gitea-network
-    ports:
-      - "8080:8080"
+    environment:
+      - PYTEST_HTTPSERVER_HOST=0.0.0.0
+      - PYTEST_HTTPSERVER_PORT=8080
     volumes:
-      - ./mock-obs/responses:/app/responses:z # Use :z for shared SELinux label
-    restart: unless-stopped
+      - ..:/opt/project:z
+    command: sleep infinity
 
   obs-staging-bot:
     build:
       context: ..
       dockerfile: integration/obs-staging-bot/Dockerfile${GIWTF_IMAGE_SUFFIX}
     container_name: obs-staging-bot
+    init: true
     networks:
       - gitea-network
     depends_on:
       gitea:
         condition: service_started
-      mock-obs:
+      tester:
         condition: service_started
     environment:
       - OBS_USER=mock
       - OBS_PASSWORD=mock-long-password
+      - AUTOGITS_STAGING_BOT_POLL_INTERVAL=2s
     volumes:
       - ./gitea-data:/gitea-data:ro,z
     command:
       - "-debug"
       - "-gitea-url=http://gitea-test:3000"
-      - "-obs=http://mock-obs:8080"
-      - "-obs-web=http://mock-obs:8080"
+      - "-obs=http://tester:8080"
+      - "-obs-web=http://tester:8080"
     restart: unless-stopped

integration/pytest.ini

@@ -7,4 +7,10 @@ markers =
     t005: Test case 005
     t006: Test case 006
     t007: Test case 007
+    t008: Test case 008
+    t009: Test case 009
+    t010: Test case 010
+    t011: Test case 011
+    t012: Test case 012
+    t013: Test case 013
     dependency: pytest-dependency marker

integration/test-plan.md

@@ -59,8 +59,8 @@ The testing will be conducted in a dedicated test environment that mimics the pr
 | **TC-SYNC-002** | P | **Update ProjectGit PR from PackageGit PR** | 1. Push a new commit to an existing PackageGit PR. | 1. The corresponding ProjectGit PR's head branch is updated with the new commit. | High |
 | **TC-SYNC-003** | P | **WIP Flag Synchronization** | 1. Mark a PackageGit PR as "Work In Progress".<br>2. Remove the WIP flag from the PackageGit PR. | 1. The corresponding ProjectGit PR is also marked as "Work In Progress".<br>2. The WIP flag on the ProjectGit PR is removed. | Medium |
 | **TC-SYNC-004** | - | **WIP Flag (multiple referenced package PRs)** | 1. Create a ProjectGit PR that references multiple PackageGit PRs.<br>2. Mark one of the PackageGit PRs as "Work In Progress".<br>3. Remove the "Work In Progress" flag from all PackageGit PRs. | 1. The ProjectGit PR is marked as "Work In Progress".<br>2. The "Work In Progress" flag is removed from the ProjectGit PR only after it has been removed from all associated PackageGit PRs. | Medium |
-| **TC-SYNC-005** | x | **NoProjectGitPR = true, edits disabled** | 1. Set `NoProjectGitPR = true` in `workflow.config`.<br>2. Create a PackageGit PR without "Allow edits from maintainers" enabled. <br>3. Push a new commit to the PackageGit PR. | 1. No ProjectGit PR is created.<br>2. The bot adds a warning comment to the PackageGit PR explaining that it cannot update the PR. | High |
-| **TC-SYNC-006** | x | **NoProjectGitPR = true, edits enabled** | 1. Set `NoProjectGitPR = true` in `workflow.config`.<br>2. Create a PackageGit PR with "Allow edits from maintainers" enabled.<br>3. Push a new commit to the PackageGit PR. | 1. No ProjectGit PR is created.<br>2. The submodule commit on the project PR is updated with the new commit from the PackageGit PR. | High |
+| **TC-SYNC-005** | S | **NoProjectGitPR = true, edits disabled** | 1. Set `NoProjectGitPR = true` in `workflow.config`.<br>2. Create a PackageGit PR without "Allow edits from maintainers" enabled. <br>3. Push a new commit to the PackageGit PR. | 1. No ProjectGit PR is created.<br>2. The bot adds a warning comment to the PackageGit PR explaining that it cannot update the PR. | High |
+| **TC-SYNC-006** | S | **NoProjectGitPR = true, edits enabled** | 1. Set `NoProjectGitPR = true` in `workflow.config`.<br>2. Create a PackageGit PR with "Allow edits from maintainers" enabled.<br>3. Push a new commit to the PackageGit PR. | 1. No ProjectGit PR is created.<br>2. The submodule commit on the project PR is updated with the new commit from the PackageGit PR. | High |
 | **TC-COMMENT-001** | - | **Detect duplicate comments** | 1. Create a PackageGit PR.<br>2. Wait for the `workflow-pr` bot to act on the PR.<br>3. Edit the body of the PR to trigger the bot a second time. | 1. The bot should not post a duplicate comment. | High |
 | **TC-REVIEW-001** | P | **Add mandatory reviewers** | 1. Create a new PackageGit PR. | 1. All mandatory reviewers are added to both the PackageGit and ProjectGit PRs. | High |
 | **TC-REVIEW-002** | - | **Add advisory reviewers** | 1. Create a new PackageGit PR with advisory reviewers defined in the configuration. | 1. Advisory reviewers are added to the PR, but their approval is not required for merging. | Medium |
@@ -70,12 +70,18 @@ The testing will be conducted in a dedicated test environment that mimics the pr
 | **TC-REVIEW-006** | P | **Package PR created by an external user (reject)** | 1. Create a PackageGit PR from the account of a user who is not a package maintainer.<br>2. One of the package maintainers rejects the PR. | 1. All package maintainers are added as reviewers.<br>2. Once one maintainer rejects the PR, the other maintainers are removed as reviewers. | High |
 | **TC-REVIEW-007** | P | **Package PR created by a maintainer with ReviewRequired=true** | 1. Set `ReviewRequired = true` in `workflow.config`.<br>2. Create a PackageGit PR from the account of a package maintainer. | 1. A review is requested from other package maintainers if available. | High |
 | **TC-MERGE-001** | P | **Automatic Merge** | 1. Create a PackageGit PR.<br>2. Ensure all mandatory reviews are completed on both project and package PRs. | 1. The PR is automatically merged. | High |
-| **TC-MERGE-002** | - | **ManualMergeOnly with Package Maintainer** | 1. Create a PackageGit PR with `ManualMergeOnly` set to `true`.<br>2. Ensure all mandatory reviews are completed on both project and package PRs.<br>3. Comment "merge ok" on the package PR from the account of a package maintainer for that package. | 1. The PR is merged. | High |
+| **TC-MERGE-002** | P | **ManualMergeOnly with Package Maintainer** | 1. Create a PackageGit PR with `ManualMergeOnly` set to `true`.<br>2. Ensure all mandatory reviews are completed on both project and package PRs.<br>3. Comment "merge ok" on the package PR from the account of a package maintainer (or requested reviewer). | 1. The PR is merged. | High |
 | **TC-MERGE-003** | - | **ManualMergeOnly with unauthorized user** | 1. Create a PackageGit PR with `ManualMergeOnly` set to `true`.<br>2. Ensure all mandatory reviews are completed on both project and package PRs.<br>3. Comment "merge ok" on the package PR from the account of a user who is not a maintainer for that package. | 1. The PR is not merged. | High |
 | **TC-MERGE-004** | - | **ManualMergeOnly with multiple packages** | 1. Create a ProjectGit PR that references multiple PackageGit PRs with `ManualMergeOnly` set to `true`.<br>2. Ensure all mandatory reviews are completed on both project and package PRs.<br>3. Comment "merge ok" on each package PR from the account of a package maintainer. | 1. The PR is merged only after "merge ok" is commented on all associated PackageGit PRs. | High |
 | **TC-MERGE-005** | - | **ManualMergeOnly with Project Maintainer** | 1. Create a PackageGit PR with `ManualMergeOnly` set to `true`.<br>2. Ensure all mandatory reviews are completed on both project and package PRs.<br>3. Comment "merge ok" on the package PR from the account of a project maintainer. | 1. The PR is merged. | High |
 | **TC-MERGE-006** | - | **ManualMergeProject with Project Maintainer** | 1. Create a PackageGit PR with `ManualMergeProject` set to `true`.<br>2. Ensure all mandatory reviews are completed on both project and package PRs.<br>3. Comment "merge ok" on the project PR from the account of a project maintainer. | 1. The PR is merged. | High |
 | **TC-MERGE-007** | - | **ManualMergeProject with unauthorized user** | 1. Create a PackageGit PR with `ManualMergeProject` set to `true`.<br>2. Ensure all mandatory reviews are completed on both project and package PRs.<br>3. Comment "merge ok" on the project PR from the account of a package maintainer. | 1. The PR is not merged. | High |
+| **TC-MERGE-008** | P | **MergeMode: ff-only (Success)** | 1. Set `MergeMode = "ff-only"`.<br>2. Create a FF-mergeable PackageGit PR.<br>3. Approve reviews on both PRs. | 1. Both PRs are automatically merged successfully. | High |
+| **TC-MERGE-009** | P | **MergeMode: ff-only (Failure)** | 1. Set `MergeMode = "ff-only"`.<br>2. Create a PackageGit PR that adds a new file.<br>3. Commit the same file with different content to the base branch to create a content conflict.<br>4. Approve reviews and trigger a sync by pushing another change. | 1. The bot detects it is not FF-mergeable.<br>2. The PR is NOT merged. | High |
+| **TC-MERGE-010** | P | **MergeMode: devel (Force-push)** | 1. Set `MergeMode = "devel"`.<br>2. Create a PackageGit PR that adds a new file.<br>3. Commit the same file with different content to the base branch to create a content conflict.<br>4. Approve reviews. | 1. Both PRs are merged.<br>2. The `pkgA` submodule points to the PR's head SHA. | High |
+| **TC-MERGE-011** | P | **MergeMode: replace (Merge-commit)** | 1. Set `MergeMode = "replace"`.<br>2. Create a PackageGit PR that adds a new file.<br>3. Enable "Allow edits from maintainers" on the PR.<br>4. Commit the same file with different content to the base branch to create a content conflict.<br>5. Approve reviews. | 1. Both PRs are merged.<br>2. The project branch HEAD is a merge commit (has >1 parent).<br>3. The `pkgA` submodule points to the PR's head SHA. | High |
+| **TC-MERGE-012** | P | **MergeMode: devel (No Conflict, Fast-forward)** | 1. Set `MergeMode = "devel"`.<br>2. Create a FF-mergeable PackageGit PR.<br>3. Approve reviews. | 1. Both PRs are merged.<br>2. The package branch HEAD matches the PR head (FF). | High |
+| **TC-MERGE-013** | P | **MergeMode: replace (No Conflict, Fast-forward)** | 1. Set `MergeMode = "replace"`.<br>2. Create a FF-mergeable PackageGit PR.<br>3. Approve reviews. | 1. Both PRs are merged.<br>2. The package branch HEAD matches the PR head (FF). | High |
 | **TC-CONFIG-001** | - | **Invalid Configuration** | 1. Provide an invalid `workflow.config` file. | 1. The bot reports an error and does not process any PRs. | High |
 | **TC-LABEL-001** | P | **Apply `staging/Auto` label** | 1. Create a new PackageGit PR. | 1. The `staging/Auto` label is applied to the ProjectGit PR. | High |
 | **TC-LABEL-002** | x | **Apply `review/Pending` label** | 1. Create a new PackageGit PR. | 1. The `review/Pending` label is applied to the ProjectGit PR when there are pending reviews. | Medium |
@@ -84,6 +90,7 @@ The testing will be conducted in a dedicated test environment that mimics the pr
 
 #### Legend:
 * P = implemented and passing;
+* S = skipped because is not implemented yet to save some execution time;
 * x = likely implemented, but investigation is needed;
 * X = implemented and likely to pass, but someteimes may fail, but troubleshooting is needed;
 * - = test is not implemented

integration/tests/conftest.py

@@ -8,14 +8,80 @@ import time
 import os
 import json
 import base64
+import re
 from tests.lib.common_test_utils import GiteaAPIClient
 
+class ObsMockState:
+    def __init__(self):
+        self.build_results = {} # project -> (package, code)
+        self.project_metas = {} # project -> scmsync
+        self.default_build_result = None
+
+@pytest.fixture
+def obs_mock_state():
+    return ObsMockState()
+
+@pytest.fixture(autouse=True)
+def default_obs_handlers(httpserver, obs_mock_state):
+    """
+    Sets up default handlers for OBS API to avoid 404s.
+    """
+    def project_meta_handler(request):
+        project = request.path.split("/")[2]
+        scmsync = obs_mock_state.project_metas.get(project, "http://gitea-test:3000/myproducts/mySLFO.git")
+        return f'<project name="{project}"><scmsync>{scmsync}</scmsync></project>'
+
+    def build_result_handler(request):
+        project = request.path.split("/")[2]
+        res = obs_mock_state.build_results.get(project) or obs_mock_state.default_build_result
+        
+        if not res:
+            return '<resultlist></resultlist>'
+        
+        package_name, code = res
+        
+        # We'll use a simple hardcoded XML here to avoid re-parsing template every time
+        # or we can use the template. For simplicity, let's use a basic one.
+        xml_template = f"""<resultlist state="mock">
+  <result project="{project}" repository="standard" arch="x86_64" code="unpublished" state="unpublished">
+    <scmsync>http://gitea-test:3000/myproducts/mySLFO.git?onlybuild={package_name}#sha</scmsync>
+    <status package="{package_name}" code="{code}"/>
+  </result>
+</resultlist>"""
+        return xml_template
+
+    # Register handlers
+    httpserver.expect_request(re.compile(r"/source/[^/]+/_meta$"), method="GET").respond_with_handler(project_meta_handler)
+    httpserver.expect_request(re.compile(r"/build/[^/]+/_result"), method="GET").respond_with_handler(build_result_handler)
+    httpserver.expect_request(re.compile(r"/source/[^/]+/_meta$"), method="PUT").respond_with_data("OK")
+    httpserver.expect_request(re.compile(r"/source/[^/]+$"), method="DELETE").respond_with_data("OK")
+
+@pytest.fixture
+def mock_build_result(obs_mock_state):
+    """
+    Fixture to set up mock build results.
+    """
+    def _setup_mock(package_name: str, code: str, project: str = None):
+        if project:
+            obs_mock_state.build_results[project] = (package_name, code)
+        else:
+            # If no project specified, we can't easily know which one to set
+            # but usually it's the one the bot will request.
+            # We'll use a special key to signify "all" or we can just wait for the request.
+            # For now, let's assume we want to match openSUSE:Leap:16.0:PullRequest:*
+            # The test will call it with specific project if needed.
+            # In test_pr_workflow, it doesn't know the PR number yet.
+            # So we'll make the handler fallback to this if project not found.
+            obs_mock_state.default_build_result = (package_name, code)
+
+    return _setup_mock
+
 BRANCH_CONFIG_COMMON = {
     "workflow.config": {
         "Workflows": ["pr"],
-        "Organization": "pool",
+        "Organization": "mypool",
         "Reviewers": ["-autogits_obs_staging_bot"],
-        "GitProjectName": "products/SLFO#{branch}"
+        "GitProjectName": "myproducts/mySLFO#{branch}"
     },
     "_maintainership.json": {
         "": ["ownerX", "ownerY"],
@@ -25,7 +91,8 @@ BRANCH_CONFIG_COMMON = {
 }
 
 BRANCH_CONFIG_CUSTOM = {
-    "main": {
+    "main": {},
+    "staging-main": {
         "workflow.config": {
             "ManualMergeProject": True
         },
@@ -54,6 +121,12 @@ BRANCH_CONFIG_CUSTOM = {
             "NoProjectGitPR": True
         }
     },
+    "manual-merge": {
+        "workflow.config": {
+            "ManualMergeOnly": True,
+            "Reviewers": ["+usera", "+userb", "-autogits_obs_staging_bot"]
+        }
+    },
     "label-test": {
         "workflow.config": {
             "ManualMergeProject": True,
@@ -64,9 +137,31 @@ BRANCH_CONFIG_CUSTOM = {
                 "ReviewPending": "review/Pending"
             }
         }
+    },
+    "merge-ff": {
+        "workflow.config": {
+            "MergeMode": "ff-only"
+        }
+    },
+    "merge-replace": {
+        "workflow.config": {
+            "MergeMode": "replace"
+        }
+    },
+    "merge-devel": {
+        "workflow.config": {
+            "MergeMode": "devel"
+        }
     }
 }
 
+# Global state to track created Gitea objects during a pytest run
+_CREATED_ORGS = set()
+_CREATED_REPOS = set()
+_CREATED_USERS = set()
+_CREATED_LABELS = set()
+_ADDED_COLLABORATORS = set() # format: (org_repo, username)
+
 def setup_users_from_config(client: GiteaAPIClient, wf: dict, mt: dict):
     """
     Parses workflow.config and _maintainership.json, creates users, and adds them as collaborators.
@@ -87,18 +182,27 @@ def setup_users_from_config(client: GiteaAPIClient, wf: dict, mt: dict):
             
     # Create all users
     for username in all_users:
-        client.create_user(username, "password123", f"{username}@example.com")
-        client.add_collaborator("products", "SLFO", username, "write")
+        if username not in _CREATED_USERS:
+            client.create_user(username, "password123", f"{username}@example.com")
+            _CREATED_USERS.add(username)
+        
+        if ("myproducts/mySLFO", username) not in _ADDED_COLLABORATORS:
+            client.add_collaborator("myproducts", "mySLFO", username, "write")
+            _ADDED_COLLABORATORS.add(("myproducts/mySLFO", username))
         
     # Set specific repository permissions based on maintainership
     for pkg, users in mt.items():
         repo_name = pkg if pkg else None
         for username in users:
             if not repo_name:
-                client.add_collaborator("pool", "pkgA", username, "write")
-                client.add_collaborator("pool", "pkgB", username, "write")
+                for r in ["pkgA", "pkgB"]:
+                    if (f"mypool/{r}", username) not in _ADDED_COLLABORATORS:
+                        client.add_collaborator("mypool", r, username, "write")
+                        _ADDED_COLLABORATORS.add((f"mypool/{r}", username))
             else:
-                client.add_collaborator("pool", repo_name, username, "write")
+                if (f"mypool/{repo_name}", username) not in _ADDED_COLLABORATORS:
+                    client.add_collaborator("mypool", repo_name, username, "write")
+                    _ADDED_COLLABORATORS.add((f"mypool/{repo_name}", username))
 
 def ensure_config_file(client: GiteaAPIClient, owner: str, repo: str, branch: str, file_name: str, expected_content_dict: dict):
     """
@@ -125,8 +229,8 @@ def gitea_env():
     """
     Global fixture to set up the Gitea environment for all tests.
     """
-    gitea_url = "http://127.0.0.1:3000"
-    admin_token_path = "./gitea-data/admin.token"
+    gitea_url = "http://gitea-test:3000"
+    admin_token_path = os.path.join(os.path.dirname(__file__), "..", "gitea-data", "admin.token")
     
     admin_token = None
     try:
@@ -149,33 +253,41 @@ def gitea_env():
         raise Exception("Gitea not available.")
 
     print("--- Starting Gitea Global Setup ---")
-    client.create_org("products")
-    client.create_org("pool")
-    client.create_repo("products", "SLFO")
-    client.create_repo("pool", "pkgA")
-    client.create_repo("pool", "pkgB")
-    client.update_repo_settings("products", "SLFO")
-    client.update_repo_settings("pool", "pkgA")
-    client.update_repo_settings("pool", "pkgB")
+    for org in ["myproducts", "mypool"]:
+        if org not in _CREATED_ORGS:
+            client.create_org(org)
+            _CREATED_ORGS.add(org)
+
+    for org, repo in [("myproducts", "mySLFO"), ("mypool", "pkgA"), ("mypool", "pkgB")]:
+        if f"{org}/{repo}" not in _CREATED_REPOS:
+            client.create_repo(org, repo)
+            client.update_repo_settings(org, repo)
+            _CREATED_REPOS.add(f"{org}/{repo}")
     
     # Create labels
-    client.create_label("products", "SLFO", "staging/Backlog", color="#0000ff")
-    client.create_label("products", "SLFO", "review/Pending", color="#ffff00")
+    for name, color in [("staging/Backlog", "#0000ff"), ("review/Pending", "#ffff00")]:
+        if ("myproducts/mySLFO", name) not in _CREATED_LABELS:
+            client.create_label("myproducts", "mySLFO", name, color=color)
+            _CREATED_LABELS.add(("myproducts/mySLFO", name))
     
-    # Submodules in SLFO
-    client.add_submodules("products", "SLFO")
+    # Submodules in mySLFO
+    client.add_submodules("myproducts", "mySLFO")
 
-    client.add_collaborator("products", "SLFO", "autogits_obs_staging_bot", "write")
-    client.add_collaborator("products", "SLFO", "workflow-pr", "write")
-    client.add_collaborator("pool", "pkgA", "workflow-pr", "write")
-    client.add_collaborator("pool", "pkgB", "workflow-pr", "write")
+    for repo_full, bot in [("myproducts/mySLFO", "autogits_obs_staging_bot"), 
+                          ("myproducts/mySLFO", "workflow-pr"),
+                          ("mypool/pkgA", "workflow-pr"),
+                          ("mypool/pkgB", "workflow-pr")]:
+        if (repo_full, bot) not in _ADDED_COLLABORATORS:
+            org_part, repo_part = repo_full.split("/")
+            client.add_collaborator(org_part, repo_part, bot, "write")
+            _ADDED_COLLABORATORS.add((repo_full, bot))
 
     restart_needed = False
     
     # Setup all branches and configs
     for branch_name, custom_configs in BRANCH_CONFIG_CUSTOM.items():
         # Ensure branch exists in all 3 repos
-        for owner, repo in [("products", "SLFO"), ("pool", "pkgA"), ("pool", "pkgB")]:
+        for owner, repo in [("myproducts", "mySLFO"), ("mypool", "pkgA"), ("mypool", "pkgB")]:
             if branch_name != "main":
                 try:
                     main_sha = client._request("GET", f"repos/{owner}/{repo}/branches/main").json()["commit"]["id"]
@@ -201,40 +313,60 @@ def gitea_env():
             else:
                 merged_configs[file_name] = custom_content
 
-        # Ensure config files in products/SLFO
+        # Ensure config files in myproducts/mySLFO
         for file_name, content_dict in merged_configs.items():
-            if ensure_config_file(client, "products", "SLFO", branch_name, file_name, content_dict):
+            if ensure_config_file(client, "myproducts", "mySLFO", branch_name, file_name, content_dict):
                 restart_needed = True
                 
         # Setup users (using configs from this branch)
         setup_users_from_config(client, merged_configs.get("workflow.config", {}), merged_configs.get("_maintainership.json", {}))
 
-    if restart_needed:
-        client.restart_service("workflow-pr")
-        time.sleep(2) # Give it time to pick up changes
-
     print("--- Gitea Global Setup Complete ---")
     yield client
 
 @pytest.fixture(scope="session")
 def automerge_env(gitea_env):
-    return gitea_env, "products/SLFO", "merge"
+    return gitea_env, "myproducts/mySLFO", "merge"
+
+@pytest.fixture(scope="session")
+def staging_main_env(gitea_env):
+    return gitea_env, "myproducts/mySLFO", "staging-main"
+
+@pytest.fixture(scope="session")
+def manual_merge_env(gitea_env):
+    return gitea_env, "myproducts/mySLFO", "manual-merge"
 
 @pytest.fixture(scope="session")
 def maintainer_env(gitea_env):
-    return gitea_env, "products/SLFO", "maintainer-merge"
+    return gitea_env, "myproducts/mySLFO", "maintainer-merge"
 
 @pytest.fixture(scope="session")
 def review_required_env(gitea_env):
-    return gitea_env, "products/SLFO", "review-required"
+    return gitea_env, "myproducts/mySLFO", "review-required"
 
 @pytest.fixture(scope="session")
 def no_project_git_pr_env(gitea_env):
-    return gitea_env, "products/SLFO", "dev"
+    return gitea_env, "myproducts/mySLFO", "dev"
 
 @pytest.fixture(scope="session")
 def label_env(gitea_env):
-    return gitea_env, "products/SLFO", "label-test"
+    return gitea_env, "myproducts/mySLFO", "label-test"
+
+@pytest.fixture(scope="session")
+def merge_ff_env(gitea_env):
+    return gitea_env, "myproducts/mySLFO", "merge-ff"
+
+@pytest.fixture(scope="session")
+def merge_replace_env(gitea_env):
+    return gitea_env, "myproducts/mySLFO", "merge-replace"
+
+@pytest.fixture(scope="session")
+def merge_devel_env(gitea_env):
+    return gitea_env, "myproducts/mySLFO", "merge-devel"
+
+@pytest.fixture(scope="session")
+def usera_client(gitea_env):
+    return GiteaAPIClient(base_url=gitea_env.base_url, token=gitea_env.headers["Authorization"].split(" ")[1], sudo="usera")
 
 @pytest.fixture(scope="session")
 def ownerA_client(gitea_env):
@@ -256,6 +388,6 @@ def staging_bot_client(gitea_env):
 def test_user_client(gitea_env):
     username = f"test-user-{int(time.time())}"
     gitea_env.create_user(username, "password123", f"{username}@example.com")
-    gitea_env.add_collaborator("pool", "pkgA", username, "write")
-    gitea_env.add_collaborator("products", "SLFO", username, "write")
+    gitea_env.add_collaborator("mypool", "pkgA", username, "write")
+    gitea_env.add_collaborator("myproducts", "mySLFO", username, "write")
     return GiteaAPIClient(base_url=gitea_env.base_url, token=gitea_env.headers["Authorization"].split(" ")[1], sudo=username)

integration/tests/data/build_result.xml.template

@@ -1,21 +1,21 @@
 <resultlist state="0fef640bfb56c3e76fcfb698b19b59c0">
   <result project="SUSE:SLFO:Main:PullRequest:1881" repository="standard" arch="aarch64" code="unpublished" state="unpublished">
-    <scmsync>https://src.suse.de/products/SLFO.git?onlybuild=openjpeg2#d99ac14dedf9f44e1744c71aaf221d15f6bed479ca11f15738e98f3bf9ae05a1</scmsync>
+    <scmsync>https://src.suse.de/myproducts/mySLFO.git?onlybuild=openjpeg2#d99ac14dedf9f44e1744c71aaf221d15f6bed479ca11f15738e98f3bf9ae05a1</scmsync>
     <scminfo>d99ac14dedf9f44e1744c71aaf221d15f6bed479ca11f15738e98f3bf9ae05a1</scminfo>
     <status package="openjpeg2" code="succeeded"/>
   </result>
   <result project="SUSE:SLFO:Main:PullRequest:1881" repository="standard" arch="ppc64le" code="unpublished" state="unpublished">
-    <scmsync>https://src.suse.de/products/SLFO.git?onlybuild=openjpeg2#d99ac14dedf9f44e1744c71aaf221d15f6bed479ca11f15738e98f3bf9ae05a1</scmsync>
+    <scmsync>https://src.suse.de/myproducts/mySLFO.git?onlybuild=openjpeg2#d99ac14dedf9f44e1744c71aaf221d15f6bed479ca11f15738e98f3bf9ae05a1</scmsync>
     <scminfo>d99ac14dedf9f44e1744c71aaf221d15f6bed479ca11f15738e98f3bf9ae05a1</scminfo>
     <status package="openjpeg2" code="succeeded"/>
   </result>
   <result project="SUSE:SLFO:Main:PullRequest:1881" repository="standard" arch="x86_64" code="unpublished" state="unpublished">
-    <scmsync>https://src.suse.de/products/SLFO.git?onlybuild=openjpeg2#d99ac14dedf9f44e1744c71aaf221d15f6bed479ca11f15738e98f3bf9ae05a1</scmsync>
+    <scmsync>https://src.suse.de/myproducts/mySLFO.git?onlybuild=openjpeg2#d99ac14dedf9f44e1744c71aaf221d15f6bed479ca11f15738e98f3bf9ae05a1</scmsync>
     <scminfo>d99ac14dedf9f44e1744c71aaf221d15f6bed479ca11f15738e98f3bf9ae05a1</scminfo>
     <status package="openjpeg2" code="succeeded"/>
   </result>
   <result project="SUSE:SLFO:Main:PullRequest:1881" repository="standard" arch="s390x" code="unpublished" state="unpublished">
-    <scmsync>https://src.suse.de/products/SLFO.git?onlybuild=openjpeg2#d99ac14dedf9f44e1744c71aaf221d15f6bed479ca11f15738e98f3bf9ae05a1</scmsync>
+    <scmsync>https://src.suse.de/myproducts/mySLFO.git?onlybuild=openjpeg2#d99ac14dedf9f44e1744c71aaf221d15f6bed479ca11f15738e98f3bf9ae05a1</scmsync>
     <scminfo>d99ac14dedf9f44e1744c71aaf221d15f6bed479ca11f15738e98f3bf9ae05a1</scminfo>
     <status package="openjpeg2" code="succeeded"/>
   </result>

integration/tests/data/source_openSUSE_Leap_16.0__meta

@@ -2,7 +2,7 @@
   <title>openSUSE Leap 16.0 based on SLFO</title>
   <description>Leap 16.0 based on SLES 16.0 (specifically SLFO:1.2)</description>
   <link project="openSUSE:Backports:SLE-16.0"/>
-  <scmsync>http://gitea-test:3000/products/SLFO#main</scmsync>
+  <scmsync>http://gitea-test:3000/myproducts/mySLFO#staging-main</scmsync>
   <person userid="dimstar_suse" role="maintainer"/>
   <person userid="lkocman-factory" role="maintainer"/>
   <person userid="maxlin_factory" role="maintainer"/>
@@ -56,4 +56,4 @@
     <arch>ppc64le</arch>
     <arch>s390x</arch>
   </repository>
-</project>
+</project>

integration/tests/lib/common_test_utils.py

@@ -3,45 +3,10 @@ import time
 import pytest
 import requests
 import json
+import re
 import xml.etree.ElementTree as ET
 from pathlib import Path
 import base64
-import subprocess
-
-TEST_DATA_DIR = Path(__file__).parent.parent / "data"
-BUILD_RESULT_TEMPLATE = TEST_DATA_DIR / "build_result.xml.template"
-MOCK_RESPONSES_DIR = Path(__file__).parent.parent.parent / "mock-obs" / "responses"
-MOCK_BUILD_RESULT_FILE = (
-    MOCK_RESPONSES_DIR / "GET_build_openSUSE:Leap:16.0:PullRequest:*__result"
-)
-MOCK_BUILD_RESULT_FILE1 = MOCK_RESPONSES_DIR / "GET_build_openSUSE:Leap:16.0__result"
-
-
-@pytest.fixture
-def mock_build_result():
-    """
-    Fixture to create a mock build result file from the template.
-    Returns a factory function that the test can call with parameters.
-    """
-
-    def _create_result_file(package_name: str, code: str):
-        tree = ET.parse(BUILD_RESULT_TEMPLATE)
-        root = tree.getroot()
-        for status_tag in root.findall(".//status"):
-            status_tag.set("package", package_name)
-            status_tag.set("code", code)
-
-        MOCK_RESPONSES_DIR.mkdir(exist_ok=True)
-        tree.write(MOCK_BUILD_RESULT_FILE)
-        tree.write(MOCK_BUILD_RESULT_FILE1)
-        return str(MOCK_BUILD_RESULT_FILE)
-
-    yield _create_result_file
-
-    if MOCK_BUILD_RESULT_FILE.exists():
-        MOCK_BUILD_RESULT_FILE.unlink()
-        MOCK_BUILD_RESULT_FILE1.unlink()
-
 
 class GiteaAPIClient:
     def __init__(self, base_url, token, sudo=None):
@@ -116,18 +81,6 @@ class GiteaAPIClient:
                 print(f"Organization '{org_name}' created.")
             else:
                 raise
-        print(f"--- Checking organization: {org_name} ---")
-        try:
-            self._request("GET", f"orgs/{org_name}")
-            print(f"Organization '{org_name}' already exists.")
-        except requests.exceptions.HTTPError as e:
-            if e.response.status_code == 404:
-                print(f"Creating organization '{org_name}'...")
-                data = {"username": org_name, "full_name": org_name}
-                self._request("POST", "orgs", json=data)
-                print(f"Organization '{org_name}' created.")
-            else:
-                raise
 
     def create_repo(self, org_name, repo_name):
         print(f"--- Checking repository: {org_name}/{repo_name} ---")
@@ -172,8 +125,8 @@ class GiteaAPIClient:
                 raise
 
         # Get latest commit SHAs for the submodules
-        pkg_a_sha = self._request("GET", "repos/pool/pkgA/branches/main").json()["commit"]["id"]
-        pkg_b_sha = self._request("GET", "repos/pool/pkgB/branches/main").json()["commit"]["id"]
+        pkg_a_sha = self._request("GET", "repos/mypool/pkgA/branches/main").json()["commit"]["id"]
+        pkg_b_sha = self._request("GET", "repos/mypool/pkgB/branches/main").json()["commit"]["id"]
 
         if not pkg_a_sha or not pkg_b_sha:
             raise Exception("Error: Could not get submodule commit SHAs. Cannot apply patch.")
@@ -186,10 +139,10 @@ index 0000000..f1838bd
 @@ -0,0 +1,6 @@
 +[submodule "pkgA"]
 +	path = pkgA
-+	url = ../../pool/pkgA.git
++	url = ../../mypool/pkgA.git
 +[submodule "pkgB"]
 +	path = pkgB
-+	url = ../../pool/pkgB.git
++	url = ../../mypool/pkgB.git
 diff --git a/pkgA b/pkgA
 new file mode 160000
 index 0000000..{pkg_a_sha}
@@ -272,12 +225,12 @@ index 0000000..{pkg_b_sha}
         owner, repo = repo_full_name.split("/")
         
         head_owner, head_repo = owner, repo
-        
+        new_branch_name = f"pr-branch-{int(time.time()*1000)}"
+
         if use_fork:
             sudo_user = self.headers.get("Sudo")
             head_owner = sudo_user
             head_repo = repo
-            new_branch_name = f"pr-branch-{int(time.time()*1000)}"
             
             print(f"--- Forking {repo_full_name} ---")
             try:
@@ -290,29 +243,11 @@ index 0000000..{pkg_b_sha}
                 else:
                     raise
             
-            # Create a unique branch in the FORK
-            base_commit_sha = self._request("GET", f"repos/{owner}/{repo}/branches/{base_branch}").json()["commit"]["id"]
-            print(f"--- Creating branch {new_branch_name} in {head_owner}/{head_repo} from {base_branch} ({base_commit_sha}) ---")
-            self._request("POST", f"repos/{head_owner}/{head_repo}/branches", json={
-                "new_branch_name": new_branch_name,
-                "old_ref": base_commit_sha
-            })
-        else:
-            new_branch_name = f"pr-branch-{int(time.time()*1000)}"
-            # Get the latest commit SHA of the base branch from the ORIGINAL repo
-            base_commit_sha = self._request("GET", f"repos/{owner}/{repo}/branches/{base_branch}").json()["commit"]["id"]
-            
-            # Try to create the branch in the ORIGINAL repo
-            print(f"--- Creating branch {new_branch_name} in {repo_full_name} ---")
-            self._request("POST", f"repos/{owner}/{repo}/branches", json={
-                "new_branch_name": new_branch_name,
-                "old_ref": base_commit_sha
-            })
-
-        # Apply the diff using diffpatch in the branch (wherever it is)
-        print(f"--- Applying diff to {head_owner}/{head_repo} branch {new_branch_name} ---")
+        # Apply the diff using diffpatch and create the new branch automatically
+        print(f"--- Applying diff to {head_owner}/{head_repo} from {base_branch} to new branch {new_branch_name} ---")
         self._request("POST", f"repos/{head_owner}/{head_repo}/diffpatch", json={
-            "branch": new_branch_name,
+            "branch": base_branch,
+            "new_branch": new_branch_name,
             "content": diff_content,
             "message": title
         })
@@ -364,8 +299,6 @@ index 0000000..{pkg_b_sha}
                 raise
         raise Exception(f"Timeout waiting for branch {branch} in {owner}/{repo}")
 
-
-
     def modify_gitea_pr(self, repo_full_name: str, pr_number: int, diff_content: str, message: str):
         owner, repo = repo_full_name.split("/")
         
@@ -389,6 +322,14 @@ index 0000000..{pkg_b_sha}
         response = self._request("PATCH", url, json=kwargs)
         return response.json()
 
+    def create_issue_comment(self, repo_full_name: str, issue_number: int, body: str):
+        owner, repo = repo_full_name.split("/")
+        url = f"repos/{owner}/{repo}/issues/{issue_number}/comments"
+        data = {"body": body}
+        print(f"--- Creating comment on {repo_full_name} issue #{issue_number} ---")
+        response = self._request("POST", url, json=data)
+        return response.json()
+
     def get_timeline_events(self, repo_full_name: str, pr_number: int):
         owner, repo = repo_full_name.split("/")
         url = f"repos/{owner}/{repo}/issues/{pr_number}/timeline"
@@ -512,13 +453,44 @@ index 0000000..{pkg_b_sha}
             time.sleep(1) # give a chance to avoid possible concurrency issues with reviews request/approval
             reviewer_client.create_review(repo_full_name, pr_number, event="APPROVED", body="Approving requested review")
 
-    def restart_service(self, service_name: str):
-        print(f"--- Restarting service: {service_name} ---")
-        try:
-            # Assumes podman-compose.yml is in the parent directory of tests/lib
-            subprocess.run(["podman-compose", "restart", service_name], check=True, cwd=os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir)))
-            print(f"Service {service_name} restarted successfully.")
-        except subprocess.CalledProcessError as e:
-            print(f"Error restarting service {service_name}: {e}")
-            raise
+    def wait_for_project_pr(self, package_pr_repo, package_pr_number, project_pr_repo="myproducts/mySLFO", timeout=60):
+        print(f"Polling {package_pr_repo} PR #{package_pr_number} timeline for forwarded PR event in {project_pr_repo}...")
+        for _ in range(timeout):
+            time.sleep(1)
+            timeline_events = self.get_timeline_events(package_pr_repo, package_pr_number)
+            for event in timeline_events:
+                if event.get("type") == "pull_ref":
+                    if not (ref_issue := event.get("ref_issue")):
+                        continue
+                    url_to_check = ref_issue.get("html_url", "")
+                    match = re.search(fr"{project_pr_repo}/pulls/(\d+)", url_to_check)
+                    if match:
+                        return int(match.group(1))
+        return None
 
+    def approve_and_wait_merge(self, package_pr_repo, package_pr_number, project_pr_number, project_pr_repo="myproducts/mySLFO", timeout=30):
+        print(f"Approving reviews and verifying both PRs are merged ({package_pr_repo}#{package_pr_number} and {project_pr_repo}#{project_pr_number})...")
+        package_merged = False
+        project_merged = False
+        
+        for i in range(timeout):
+            self.approve_requested_reviews(package_pr_repo, package_pr_number)
+            self.approve_requested_reviews(project_pr_repo, project_pr_number)
+            
+            if not package_merged:
+                pkg_details = self.get_pr_details(package_pr_repo, package_pr_number)
+                if pkg_details.get("merged"):
+                    package_merged = True
+                    print(f"Package PR {package_pr_repo}#{package_pr_number} merged.")
+            
+            if not project_merged:
+                prj_details = self.get_pr_details(project_pr_repo, project_pr_number)
+                if prj_details.get("merged"):
+                    project_merged = True
+                    print(f"Project PR {project_pr_repo}#{project_pr_number} merged.")
+            
+            if package_merged and project_merged:
+                return True, True
+                
+            time.sleep(1)
+        return package_merged, project_merged

integration/tests/test_pr_workflow.py

@@ -1,12 +1,9 @@
 import pytest
 import re
 import time
-import subprocess
 import requests
-from pathlib import Path
 from tests.lib.common_test_utils import (
     GiteaAPIClient,
-    mock_build_result,
 )
 
 # =============================================================================
@@ -14,42 +11,24 @@ from tests.lib.common_test_utils import (
 # =============================================================================
 
 
-def test_pr_workflow_succeeded(gitea_env, mock_build_result):
+def test_pr_workflow_succeeded(staging_main_env, mock_build_result):
     """End-to-end test for a successful PR workflow."""
+    gitea_env, test_full_repo_name, merge_branch_name = staging_main_env
     diff = "diff --git a/test.txt b/test.txt\nnew file mode 100644\nindex 0000000..e69de29\n"
-    pr = gitea_env.create_gitea_pr("pool/pkgA", diff, "Test PR - should succeed", False)
+    pr = gitea_env.create_gitea_pr("mypool/pkgA", diff, "Test PR - should succeed", False, base_branch=merge_branch_name)
     initial_pr_number = pr["number"]
 
-    compose_dir = Path(__file__).parent.parent
-
-    forwarded_pr_number = None
-    print(
-        f"Polling pool/pkgA PR #{initial_pr_number} timeline for forwarded PR event..."
-    )
-    for _ in range(20):
-        time.sleep(1)
-        timeline_events = gitea_env.get_timeline_events("pool/pkgA", initial_pr_number)
-        for event in timeline_events:
-            if event.get("type") == "pull_ref":
-                if not (ref_issue := event.get("ref_issue")):
-                    continue
-                url_to_check = ref_issue.get("html_url", "")
-                match = re.search(r"products/SLFO/pulls/(\d+)", url_to_check)
-                if match:
-                    forwarded_pr_number = match.group(1)
-                    break
-        if forwarded_pr_number:
-            break
+    forwarded_pr_number = gitea_env.wait_for_project_pr("mypool/pkgA", initial_pr_number)
     assert (
         forwarded_pr_number is not None
-    ), "Workflow bot did not create a pull_ref event on the timeline."
-    print(f"Found forwarded PR: products/SLFO #{forwarded_pr_number}")
+    ), "Workflow bot did not create a project PR."
+    print(f"Found forwarded PR: myproducts/mySLFO #{forwarded_pr_number}")
 
-    print(f"Polling products/SLFO PR #{forwarded_pr_number} for reviewer assignment...")
+    print(f"Polling myproducts/mySLFO PR #{forwarded_pr_number} for reviewer assignment...")
     reviewer_added = False
     for _ in range(15):
         time.sleep(1)
-        pr_details = gitea_env.get_pr_details("products/SLFO", forwarded_pr_number)
+        pr_details = gitea_env.get_pr_details("myproducts/mySLFO", forwarded_pr_number)
         if any(
             r.get("login") == "autogits_obs_staging_bot"
             for r in pr_details.get("requested_reviewers", [])
@@ -59,21 +38,14 @@ def test_pr_workflow_succeeded(gitea_env, mock_build_result):
     assert reviewer_added, "Staging bot was not added as a reviewer."
     print("Staging bot has been added as a reviewer.")
 
-    mock_build_result(package_name="pkgA", code="succeeded") 
+    mock_build_result(package_name="pkgA", code="succeeded")
 
-    print("Restarting obs-staging-bot...")
-    subprocess.run(
-        ["podman-compose", "restart", "obs-staging-bot"],
-        cwd=compose_dir,
-        check=True,
-        capture_output=True,
-    )
+    print(f"Polling myproducts/mySLFO PR #{forwarded_pr_number} for final status...")
 
-    print(f"Polling products/SLFO PR #{forwarded_pr_number} for final status...")
     status_comment_found = False
     for _ in range(20):
         time.sleep(1)
-        timeline_events = gitea_env.get_timeline_events("products/SLFO", forwarded_pr_number)
+        timeline_events = gitea_env.get_timeline_events("myproducts/mySLFO", forwarded_pr_number)
         for event in timeline_events:
             print(event.get("body", "not a body"))
             if event.get("body") and "successful" in event["body"]:
@@ -84,42 +56,24 @@ def test_pr_workflow_succeeded(gitea_env, mock_build_result):
     assert status_comment_found, "Staging bot did not post a 'successful' comment."
 
 
-def test_pr_workflow_failed(gitea_env, mock_build_result):
+def test_pr_workflow_failed(staging_main_env, mock_build_result):
     """End-to-end test for a failed PR workflow."""
+    gitea_env, test_full_repo_name, merge_branch_name = staging_main_env
     diff = "diff --git a/another_test.txt b/another_test.txt\nnew file mode 100644\nindex 0000000..e69de29\n"
-    pr = gitea_env.create_gitea_pr("pool/pkgA", diff, "Test PR - should fail", False)
+    pr = gitea_env.create_gitea_pr("mypool/pkgA", diff, "Test PR - should fail", False, base_branch=merge_branch_name)
     initial_pr_number = pr["number"]
 
-    compose_dir = Path(__file__).parent.parent
-
-    forwarded_pr_number = None
-    print(
-        f"Polling pool/pkgA PR #{initial_pr_number} timeline for forwarded PR event..."
-    )
-    for _ in range(20):
-        time.sleep(1)
-        timeline_events = gitea_env.get_timeline_events("pool/pkgA", initial_pr_number)
-        for event in timeline_events:
-            if event.get("type") == "pull_ref":
-                if not (ref_issue := event.get("ref_issue")):
-                    continue
-                url_to_check = ref_issue.get("html_url", "")
-                match = re.search(r"products/SLFO/pulls/(\d+)", url_to_check)
-                if match:
-                    forwarded_pr_number = match.group(1)
-                    break
-        if forwarded_pr_number:
-            break
+    forwarded_pr_number = gitea_env.wait_for_project_pr("mypool/pkgA", initial_pr_number)
     assert (
         forwarded_pr_number is not None
-    ), "Workflow bot did not create a pull_ref event on the timeline."
-    print(f"Found forwarded PR: products/SLFO #{forwarded_pr_number}")
+    ), "Workflow bot did not create a project PR."
+    print(f"Found forwarded PR: myproducts/mySLFO #{forwarded_pr_number}")
 
-    print(f"Polling products/SLFO PR #{forwarded_pr_number} for reviewer assignment...")
+    print(f"Polling myproducts/mySLFO PR #{forwarded_pr_number} for reviewer assignment...")
     reviewer_added = False
     for _ in range(15):
         time.sleep(1)
-        pr_details = gitea_env.get_pr_details("products/SLFO", forwarded_pr_number)
+        pr_details = gitea_env.get_pr_details("myproducts/mySLFO", forwarded_pr_number)
         if any(
             r.get("login") == "autogits_obs_staging_bot"
             for r in pr_details.get("requested_reviewers", [])
@@ -131,19 +85,11 @@ def test_pr_workflow_failed(gitea_env, mock_build_result):
 
     mock_build_result(package_name="pkgA", code="failed")
 
-    print("Restarting obs-staging-bot...")
-    subprocess.run(
-        ["podman-compose", "restart", "obs-staging-bot"],
-        cwd=compose_dir,
-        check=True,
-        capture_output=True,
-    )
-
-    print(f"Polling products/SLFO PR #{forwarded_pr_number} for final status...")
+    print(f"Polling myproducts/mySLFO PR #{forwarded_pr_number} for final status...")
     status_comment_found = False
     for _ in range(20):
         time.sleep(1)
-        timeline_events = gitea_env.get_timeline_events("products/SLFO", forwarded_pr_number)
+        timeline_events = gitea_env.get_timeline_events("myproducts/mySLFO", forwarded_pr_number)
         for event in timeline_events:
             if event.get("body") and "failed" in event["body"]:
                 status_comment_found = True

integration/tests/workflow_pr_label_test.py

@@ -29,40 +29,24 @@ def test_001_project_pr_labels(label_env, staging_bot_client):
 new file mode 100644
 index 0000000..e69de29
 """
-    print(f"--- Creating package PR in pool/pkgA on branch {branch_name} ---")
-    package_pr = gitea_env.create_gitea_pr("pool/pkgA", diff, "Test Labels Fixture", False, base_branch=branch_name)
+    print(f"--- Creating package PR in mypool/pkgA on branch {branch_name} ---")
+    package_pr = gitea_env.create_gitea_pr("mypool/pkgA", diff, "Test Labels Fixture", False, base_branch=branch_name)
     package_pr_number = package_pr["number"]
-    print(f"Created package PR pool/pkgA#{package_pr_number}")
+    print(f"Created package PR mypool/pkgA#{package_pr_number}")
 
     # 2. Make sure the workflow-pr service created related project PR
-    project_pr_number = None
-    print(f"Polling pool/pkgA PR #{package_pr_number} timeline for forwarded PR event...")
-    for _ in range(40):
-        time.sleep(1)
-        timeline_events = gitea_env.get_timeline_events("pool/pkgA", package_pr_number)
-        for event in timeline_events:
-            if event.get("type") == "pull_ref":
-                if not (ref_issue := event.get("ref_issue")):
-                    continue
-                url_to_check = ref_issue.get("html_url", "")
-                match = re.search(r"products/SLFO/pulls/(\d+)", url_to_check)
-                if match:
-                    project_pr_number = int(match.group(1))
-                    break
-        if project_pr_number:
-            break
-    
+    project_pr_number = gitea_env.wait_for_project_pr("mypool/pkgA", package_pr_number)
     assert project_pr_number is not None, "Workflow bot did not create a project PR."
-    print(f"Found project PR: products/SLFO#{project_pr_number}")
+    print(f"Found project PR: myproducts/mySLFO#{project_pr_number}")
 
     # 3. Wait for the project PR to have the label "staging/Backlog"
-    print(f"Checking for 'staging/Backlog' label on project PR products/SLFO#{project_pr_number}...")
+    print(f"Checking for 'staging/Backlog' label on project PR myproducts/mySLFO#{project_pr_number}...")
     
     backlog_label_found = False
     expected_backlog_label = "staging/Backlog"
     
     for _ in range(20):
-        project_pr_details = gitea_env.get_pr_details("products/SLFO", project_pr_number)
+        project_pr_details = gitea_env.get_pr_details("myproducts/mySLFO", project_pr_number)
         labels = project_pr_details.get("labels", [])
         label_names = [l["name"] for l in labels]
         if expected_backlog_label in label_names:
@@ -70,21 +54,21 @@ index 0000000..e69de29
             break
         time.sleep(1)
 
-    assert backlog_label_found, f"Project PR products/SLFO#{project_pr_number} does not have the expected label '{expected_backlog_label}'."
-    print(f"Project PR products/SLFO#{project_pr_number} has the expected label '{expected_backlog_label}'.")
+    assert backlog_label_found, f"Project PR myproducts/mySLFO#{project_pr_number} does not have the expected label '{expected_backlog_label}'."
+    print(f"Project PR myproducts/mySLFO#{project_pr_number} has the expected label '{expected_backlog_label}'.")
 
     # 4. Post approval from autogits_obs_staging_bot
-    print(f"--- Posting approval from autogits_obs_staging_bot on project PR products/SLFO#{project_pr_number} ---")
-    staging_bot_client.create_review("products/SLFO", project_pr_number, event="APPROVED", body="Staging OK")
+    print(f"--- Posting approval from autogits_obs_staging_bot on project PR myproducts/mySLFO#{project_pr_number} ---")
+    staging_bot_client.create_review("myproducts/mySLFO", project_pr_number, event="APPROVED", body="Staging OK")
 
     # 5. Check that the project PR has the label "review/Pending"
-    print(f"Checking for 'review/Pending' label on project PR products/SLFO#{project_pr_number}...")
+    print(f"Checking for 'review/Pending' label on project PR myproducts/mySLFO#{project_pr_number}...")
     
     pending_label_found = False
     expected_pending_label = "review/Pending"
     
     for _ in range(20):
-        project_pr_details = gitea_env.get_pr_details("products/SLFO", project_pr_number)
+        project_pr_details = gitea_env.get_pr_details("myproducts/mySLFO", project_pr_number)
         labels = project_pr_details.get("labels", [])
         label_names = [l["name"] for l in labels]
         print(f"Current labels: {label_names}")
@@ -93,5 +77,5 @@ index 0000000..e69de29
             break
         time.sleep(1)
 
-    assert pending_label_found, f"Project PR products/SLFO#{project_pr_number} does not have the expected label '{expected_pending_label}'."
-    print(f"Project PR products/SLFO#{project_pr_number} has the expected label '{expected_pending_label}'.")
+    assert pending_label_found, f"Project PR myproducts/mySLFO#{project_pr_number} does not have the expected label '{expected_pending_label}'."
+    print(f"Project PR myproducts/mySLFO#{project_pr_number} has the expected label '{expected_pending_label}'.")

integration/tests/workflow_pr_merge_test.py

@@ -7,75 +7,484 @@ from tests.lib.common_test_utils import GiteaAPIClient
 @pytest.mark.t001
 def test_001_automerge(automerge_env, test_user_client):
     """
-    Test scenario:
-    1. Setup custom workflow.config with mandatory reviewers (+usera, +userb).
-    2. Create a package PR in 'merge' branch.
-    3. Make sure the workflow-pr service created related project PR in 'merge' branch.
-    4. React on 'requested' reviews by approving them.
-    5. Make sure both PRs are merged automatically by the workflow-pr service.
+    Test scenario TC-MERGE-001:
+    1. Create a PackageGit PR.
+    2. Ensure all mandatory reviews are completed on both project and package PRs.
+    3. Verify the PR is merged automatically.
     """
     gitea_env, test_full_repo_name, merge_branch_name = automerge_env
 
     # 1. Create a package PR
-    diff = """diff --git a/merge_test_fixture.txt b/merge_test_fixture.txt
+    diff = """diff --git a/automerge_test.txt b/automerge_test.txt
 new file mode 100644
 index 0000000..e69de29
 """
-    print(f"--- Creating package PR in pool/pkgA on branch {merge_branch_name} ---")
-    package_pr = test_user_client.create_gitea_pr("pool/pkgA", diff, "Test Automerge Fixture", False, base_branch=merge_branch_name)
+    print(f"--- Creating package PR in mypool/pkgA on branch {merge_branch_name} ---")
+    package_pr = test_user_client.create_gitea_pr("mypool/pkgA", diff, "Test Automerge Fixture", False, base_branch=merge_branch_name)
     package_pr_number = package_pr["number"]
-    print(f"Created package PR pool/pkgA#{package_pr_number}")
+    print(f"Created package PR mypool/pkgA#{package_pr_number}")
 
     # 2. Make sure the workflow-pr service created related project PR
-    project_pr_number = None
-    print(f"Polling pool/pkgA PR #{package_pr_number} timeline for forwarded PR event...")
-    for _ in range(40):
-        time.sleep(1)
-        timeline_events = gitea_env.get_timeline_events("pool/pkgA", package_pr_number)
-        for event in timeline_events:
-            if event.get("type") == "pull_ref":
-                if not (ref_issue := event.get("ref_issue")):
-                    continue
-                url_to_check = ref_issue.get("html_url", "")
-                match = re.search(r"products/SLFO/pulls/(\d+)", url_to_check)
-                if match:
-                    project_pr_number = int(match.group(1))
-                    break
-        if project_pr_number:
-            break
-    
+    project_pr_number = gitea_env.wait_for_project_pr("mypool/pkgA", package_pr_number)
     assert project_pr_number is not None, "Workflow bot did not create a project PR."
-    print(f"Found project PR: products/SLFO#{project_pr_number}")
+    print(f"Found project PR: myproducts/mySLFO#{project_pr_number}")
 
-    # 4. Make sure both PRs are merged automatically by the workflow-pr service
-    print("Polling for PR merge status and reacting on REQUEST_REVIEW...")
+    # 3. Approve reviews and verify merged
+    pkg_merged, prj_merged = gitea_env.approve_and_wait_merge("mypool/pkgA", package_pr_number, project_pr_number)
+    assert pkg_merged, f"Package PR mypool/pkgA#{package_pr_number} was not merged automatically."
+    assert prj_merged, f"Project PR myproducts/mySLFO#{project_pr_number} was not merged automatically."
+    print("Both PRs merged successfully.")
+
+@pytest.mark.t002
+def test_002_manual_merge(manual_merge_env, test_user_client, usera_client, staging_bot_client):
+    """
+    Test scenario TC-MERGE-002:
+    1. Create a PackageGit PR with ManualMergeOnly set to true.
+    2. Ensure all mandatory reviews are completed on both project and package PRs.
+    3. Comment "merge ok" on the package PR from the account of a requested reviewer.
+    4. Verify the PR is merged.
+    """
+    gitea_env, test_full_repo_name, merge_branch_name = manual_merge_env
+
+    # 1. Create a package PR
+    diff = """diff --git a/manual_merge_test.txt b/manual_merge_test.txt
+new file mode 100644
+index 0000000..e69de29
+"""
+    print(f"--- Creating package PR in mypool/pkgA on branch {merge_branch_name} ---")
+    package_pr = test_user_client.create_gitea_pr("mypool/pkgA", diff, "Test Manual Merge Fixture", False, base_branch=merge_branch_name)
+    package_pr_number = package_pr["number"]
+    print(f"Created package PR mypool/pkgA#{package_pr_number}")
+
+    # 2. Make sure the workflow-pr service created related project PR
+    project_pr_number = gitea_env.wait_for_project_pr("mypool/pkgA", package_pr_number)
+    assert project_pr_number is not None, "Workflow bot did not create a project PR."
+    print(f"Found project PR: myproducts/mySLFO#{project_pr_number}")
+
+    # 3. Approve reviews and verify NOT merged
+    print("Waiting for all expected review requests and approving them...")
+    # Expected reviewers based on manual-merge branch config and pkgA maintainership
+    expected_reviewers = {"usera", "userb", "ownerA", "ownerX", "ownerY"}
+    
+    # ManualMergeOnly still requires regular reviews to be satisfied.
+    # We poll until all expected reviewers are requested, then approve them.
+    all_requested = False
+    for _ in range(30):
+        # Trigger approvals for whatever is already requested
+        gitea_env.approve_requested_reviews("mypool/pkgA", package_pr_number)
+        gitea_env.approve_requested_reviews("myproducts/mySLFO", project_pr_number)
+        
+        # Explicitly handle staging bot if it is requested or pending
+        prj_reviews = gitea_env.list_reviews("myproducts/mySLFO", project_pr_number)
+        if any(r["user"]["login"] == "autogits_obs_staging_bot" and r["state"] in ["REQUEST_REVIEW", "PENDING"] for r in prj_reviews):
+            print("Staging bot has a pending/requested review. Approving...")
+            staging_bot_client.create_review("myproducts/mySLFO", project_pr_number, event="APPROVED", body="Staging bot approves")
+
+        # Check if all expected reviewers have at least one review record (any state)
+        pkg_reviews = gitea_env.list_reviews("mypool/pkgA", package_pr_number)
+        current_reviewers = {r["user"]["login"] for r in pkg_reviews}
+        
+        if expected_reviewers.issubset(current_reviewers):
+            # Also ensure they are all approved (not just requested)
+            approved_reviewers = {r["user"]["login"] for r in pkg_reviews if r["state"] == "APPROVED"}
+            if expected_reviewers.issubset(approved_reviewers):
+                # And check project PR for bot approval
+                prj_approved = any(r["user"]["login"] == "autogits_obs_staging_bot" and r["state"] == "APPROVED" for r in prj_reviews)
+                if prj_approved:
+                    all_requested = True
+                    print(f"All expected reviewers {expected_reviewers} and staging bot have approved.")
+                    break
+        
+        pkg_details = gitea_env.get_pr_details("mypool/pkgA", package_pr_number)
+        prj_details = gitea_env.get_pr_details("myproducts/mySLFO", project_pr_number)
+        
+        assert not pkg_details.get("merged"), "Package PR merged prematurely (ManualMergeOnly ignored?)"
+        assert not prj_details.get("merged"), "Project PR merged prematurely (ManualMergeOnly ignored?)"
+        
+        time.sleep(2)
+
+    assert all_requested, f"Timed out waiting for all expected reviewers {expected_reviewers} to approve. Current: {current_reviewers}"
+    print("Both PRs have all required approvals but are not merged (as expected with ManualMergeOnly).")
+
+    # 4. Comment "merge ok" from a requested reviewer (usera)
+    print("Commenting 'merge ok' on package PR...")
+    usera_client.create_issue_comment("mypool/pkgA", package_pr_number, "merge ok")
+
+    # 5. Verify both PRs are merged
+    print("Polling for PR merge status...")
     package_merged = False
     project_merged = False
     
-    for i in range(15): # Poll for up to 15 seconds
-        # Package PR
+    for i in range(20): # Poll for up to 20 seconds
         if not package_merged:
-            pkg_details = gitea_env.get_pr_details("pool/pkgA", package_pr_number)
+            pkg_details = gitea_env.get_pr_details("mypool/pkgA", package_pr_number)
             if pkg_details.get("merged"):
                 package_merged = True
-                print(f"Package PR pool/pkgA#{package_pr_number} merged.")
-            else:
-                gitea_env.approve_requested_reviews("pool/pkgA", package_pr_number)
+                print(f"Package PR mypool/pkgA#{package_pr_number} merged.")
         
-        # Project PR
         if not project_merged:
-            prj_details = gitea_env.get_pr_details("products/SLFO", project_pr_number)
+            prj_details = gitea_env.get_pr_details("myproducts/mySLFO", project_pr_number)
             if prj_details.get("merged"):
                 project_merged = True
-                print(f"Project PR products/SLFO#{project_pr_number} merged.")
-            else:
-                gitea_env.approve_requested_reviews("products/SLFO", project_pr_number)
+                print(f"Project PR myproducts/mySLFO#{project_pr_number} merged.")
         
         if package_merged and project_merged:
             break
             
         time.sleep(1)
             
-    assert package_merged, f"Package PR pool/pkgA#{package_pr_number} was not merged automatically."
-    assert project_merged, f"Project PR products/SLFO#{project_pr_number} was not merged automatically."
-    print("Both PRs merged successfully.")
+    assert package_merged, f"Package PR mypool/pkgA#{package_pr_number} was not merged after 'merge ok'."
+    assert project_merged, f"Project PR myproducts/mySLFO#{project_pr_number} was not merged after 'merge ok'."
+    print("Both PRs merged successfully after 'merge ok'.")
+
+@pytest.mark.t003
+def test_003_refuse_manual_merge(manual_merge_env, test_user_client, ownerB_client, staging_bot_client):
+    """
+    Test scenario TC-MERGE-003:
+    1. Create a PackageGit PR with ManualMergeOnly set to true.
+    2. Ensure all mandatory reviews are completed on both project and package PRs.
+    3. Comment "merge ok" on the package PR from the account of a not requested reviewer.
+    4. Verify the PR is not merged.
+    """
+    gitea_env, test_full_repo_name, merge_branch_name = manual_merge_env
+
+    # 1. Create a package PR
+    diff = """diff --git a/manual_merge_test.txt b/manual_merge_test.txt
+new file mode 100644
+index 0000000..e69de29
+"""
+    print(f"--- Creating package PR in mypool/pkgA on branch {merge_branch_name} ---")
+    package_pr = test_user_client.create_gitea_pr("mypool/pkgA", diff, "Test Manual Merge Fixture", False, base_branch=merge_branch_name)
+    package_pr_number = package_pr["number"]
+    print(f"Created package PR mypool/pkgA#{package_pr_number}")
+
+    # 2. Make sure the workflow-pr service created related project PR
+    project_pr_number = gitea_env.wait_for_project_pr("mypool/pkgA", package_pr_number)
+    assert project_pr_number is not None, "Workflow bot did not create a project PR."
+    print(f"Found project PR: myproducts/mySLFO#{project_pr_number}")
+
+    # 3. Approve reviews and verify NOT merged
+    print("Waiting for all expected review requests and approving them...")
+    # Expected reviewers based on manual-merge branch config and pkgA maintainership
+    expected_reviewers = {"usera", "userb", "ownerA", "ownerX", "ownerY"}
+    
+    # ManualMergeOnly still requires regular reviews to be satisfied.
+    # We poll until all expected reviewers are requested, then approve them.
+    all_requested = False
+    for _ in range(30):
+        # Trigger approvals for whatever is already requested
+        gitea_env.approve_requested_reviews("mypool/pkgA", package_pr_number)
+        gitea_env.approve_requested_reviews("myproducts/mySLFO", project_pr_number)
+        
+        # Explicitly handle staging bot if it is requested or pending
+        prj_reviews = gitea_env.list_reviews("myproducts/mySLFO", project_pr_number)
+        if any(r["user"]["login"] == "autogits_obs_staging_bot" and r["state"] in ["REQUEST_REVIEW", "PENDING"] for r in prj_reviews):
+            print("Staging bot has a pending/requested review. Approving...")
+            staging_bot_client.create_review("myproducts/mySLFO", project_pr_number, event="APPROVED", body="Staging bot approves")
+
+        # Check if all expected reviewers have at least one review record (any state)
+        pkg_reviews = gitea_env.list_reviews("mypool/pkgA", package_pr_number)
+        current_reviewers = {r["user"]["login"] for r in pkg_reviews}
+        
+        if expected_reviewers.issubset(current_reviewers):
+            # Also ensure they are all approved (not just requested)
+            approved_reviewers = {r["user"]["login"] for r in pkg_reviews if r["state"] == "APPROVED"}
+            if expected_reviewers.issubset(approved_reviewers):
+                # And check project PR for bot approval
+                prj_approved = any(r["user"]["login"] == "autogits_obs_staging_bot" and r["state"] == "APPROVED" for r in prj_reviews)
+                if prj_approved:
+                    all_requested = True
+                    print(f"All expected reviewers {expected_reviewers} and staging bot have approved.")
+                    break
+        
+        pkg_details = gitea_env.get_pr_details("mypool/pkgA", package_pr_number)
+        prj_details = gitea_env.get_pr_details("myproducts/mySLFO", project_pr_number)
+        
+        assert not pkg_details.get("merged"), "Package PR merged prematurely (ManualMergeOnly ignored?)"
+        assert not prj_details.get("merged"), "Project PR merged prematurely (ManualMergeOnly ignored?)"
+        
+        time.sleep(2)
+
+    assert all_requested, f"Timed out waiting for all expected reviewers {expected_reviewers} to approve. Current: {current_reviewers}"
+    print("Both PRs have all required approvals but are not merged (as expected with ManualMergeOnly).")
+
+    # 4. Comment "merge ok" from a requested reviewer (ownerB)
+    print("Commenting 'merge ok' on package PR as user ownerB ...")
+    ownerB_client.create_issue_comment("mypool/pkgA", package_pr_number, "merge ok")
+
+    # 5. Verify both PRs are merged
+    print("Polling for PR merge status...")
+    package_merged = False
+    project_merged = False
+    
+    for i in range(20): # Poll for up to 20 seconds
+        if not package_merged:
+            pkg_details = gitea_env.get_pr_details("mypool/pkgA", package_pr_number)
+            if pkg_details.get("merged"):
+                package_merged = True
+                print(f"Package PR mypool/pkgA#{package_pr_number} merged.")
+        
+        if not project_merged:
+            prj_details = gitea_env.get_pr_details("myproducts/mySLFO", project_pr_number)
+            if prj_details.get("merged"):
+                project_merged = True
+                print(f"Project PR myproducts/mySLFO#{project_pr_number} merged.")
+        
+        if package_merged and project_merged:
+            break
+            
+        time.sleep(1)
+            
+    assert not package_merged, f"Package PR mypool/pkgA#{package_pr_number} was merged after 'merge ok'."
+    assert not project_merged, f"Project PR myproducts/mySLFO#{project_pr_number} was merged after 'merge ok'."
+    print("Both PRs merged not after 'merge ok'.")
+
+@pytest.mark.t008
+def test_008_merge_mode_ff_only_success(merge_ff_env, test_user_client):
+    """
+    Test MergeMode "ff-only" - Success case (FF-mergeable)
+    """
+    gitea_env, test_full_repo_name, merge_branch_name = merge_ff_env
+
+    # 1. Create a package PR (this will be FF-mergeable by default)
+    diff = """diff --git a/ff_test.txt b/ff_test.txt
+new file mode 100644
+index 0000000..e69de29
+"""
+    package_pr = test_user_client.create_gitea_pr("mypool/pkgA", diff, "Test FF Merge", False, base_branch=merge_branch_name)
+    package_pr_number = package_pr["number"]
+    
+    project_pr_number = gitea_env.wait_for_project_pr("mypool/pkgA", package_pr_number)
+    assert project_pr_number is not None
+
+    pkg_merged, prj_merged = gitea_env.approve_and_wait_merge("mypool/pkgA", package_pr_number, project_pr_number)
+    assert pkg_merged and prj_merged
+
+@pytest.mark.t009
+def test_009_merge_mode_ff_only_failure(merge_ff_env, ownerA_client):
+    """
+    Test MergeMode "ff-only" - Failure case (Content Conflict, should NOT merge)
+    """
+    gitea_env, test_full_repo_name, merge_branch_name = merge_ff_env
+
+    ts = time.strftime("%H%M%S")
+    filename = f"ff_fail_test_{ts}.txt"
+
+    # 1. Create a package PR that adds a file
+    diff = f"""diff --git a/{filename} b/{filename}
+new file mode 100644
+index 0000000..e69de29
+--- /dev/null
++++ b/{filename}
+@@ -0,0 +1 @@
++PR content
+"""
+    package_pr = ownerA_client.create_gitea_pr("mypool/pkgA", diff, "Test FF Merge Failure (Conflict)", False, base_branch=merge_branch_name)
+    package_pr_number = package_pr["number"]
+    
+    # 2. Wait for project PR to be created
+    project_pr_number = gitea_env.wait_for_project_pr("mypool/pkgA", package_pr_number)
+    assert project_pr_number is not None
+
+    print("Making PR non-FF by creating a content conflict in the base branch...")
+    gitea_env.create_file("mypool", "pkgA", filename, "Conflicting base content\n", branch=merge_branch_name)
+
+    print("Approving reviews initially...")
+    gitea_env.approve_requested_reviews("mypool/pkgA", package_pr_number)
+    gitea_env.approve_requested_reviews("myproducts/mySLFO", project_pr_number)
+
+    print("Pushing another change to PR branch to trigger sync...")
+    gitea_env.modify_gitea_pr("mypool/pkgA", package_pr_number, 
+                             "diff --git a/sync_test.txt b/sync_test.txt\nnew file mode 100644\nindex 0000000..e69de29\n",
+                             "Trigger Sync")
+
+    # The bot should detect it's not FF and NOT merge, and re-request reviews because of the new commit
+    print("Waiting for reviews to be re-requested and approving again...")
+    time.sleep(10) # Wait for bot to process sync
+    
+    # Approve again and verify it is NOT merged
+    print("Approving again and verifying PR is NOT merged (because it's not FF)...")
+    for i in range(15):
+        gitea_env.approve_requested_reviews("mypool/pkgA", package_pr_number)
+        gitea_env.approve_requested_reviews("myproducts/mySLFO", project_pr_number)
+        time.sleep(1)
+        
+    pkg_details = gitea_env.get_pr_details("mypool/pkgA", package_pr_number)
+    assert not pkg_details.get("merged"), "Package PR merged despite NOT being FF-mergeable!"
+    
+    print("FF-only failure (not merged after sync) verified.")
+
+@pytest.mark.t010
+def test_010_merge_mode_devel_success(merge_devel_env, ownerA_client):
+    """
+    Test MergeMode "devel" - Success case (Content Conflict, should still merge via force-push)
+    """
+    gitea_env, test_full_repo_name, merge_branch_name = merge_devel_env
+
+    ts = time.strftime("%H%M%S")
+    filename = f"devel_test_{ts}.txt"
+
+    # 1. Create a package PR that adds a file
+    diff = f"""diff --git a/{filename} b/{filename}
+new file mode 100644
+index 0000000..e69de29
+--- /dev/null
++++ b/{filename}
+@@ -0,0 +1 @@
++PR content
+"""
+    package_pr = ownerA_client.create_gitea_pr("mypool/pkgA", diff, "Test Devel Merge (Conflict)", False, base_branch=merge_branch_name)
+    package_pr_number = package_pr["number"]
+    
+    # 2. Create a content conflict by committing the same file to the base branch
+    gitea_env.create_file("mypool", "pkgA", filename, "Conflicting base content\n", branch=merge_branch_name)
+
+    project_pr_number = gitea_env.wait_for_project_pr("mypool/pkgA", package_pr_number)
+    assert project_pr_number is not None
+
+    # Before merge, get the head sha of the package pr and project pr
+    pkg_details = gitea_env.get_pr_details("mypool/pkgA", package_pr_number)
+    pkg_head_sha = pkg_details["head"]["sha"]
+    prj_details = gitea_env.get_pr_details("myproducts/mySLFO", project_pr_number)
+    prj_head_sha = prj_details["head"]["sha"]
+
+    pkg_merged, prj_merged = gitea_env.approve_and_wait_merge("mypool/pkgA", package_pr_number, project_pr_number)
+    assert pkg_merged and prj_merged
+    print("Devel merge (force-push) successful.")
+
+    # Verify that pkgA submodule points to the correct SHA
+    pkgA_submodule_info = gitea_env.get_file_info("myproducts", "mySLFO", "pkgA", branch=merge_branch_name)
+    assert pkgA_submodule_info["sha"] == pkg_head_sha, f"Submodule pkgA should point to {pkg_head_sha} but points to {pkgA_submodule_info['sha']}"
+
+@pytest.mark.t011
+def test_011_merge_mode_replace_success(merge_replace_env, ownerA_client):
+    """
+    Test MergeMode "replace" - Success case (Content Conflict, bot should add merge commit)
+    """
+    gitea_env, test_full_repo_name, merge_branch_name = merge_replace_env
+
+    ts = time.strftime("%H%M%S")
+    filename = f"replace_test_{ts}.txt"
+
+    # 1. Create a package PR that adds a file
+    diff = f"""diff --git a/{filename} b/{filename}
+new file mode 100644
+index 0000000..e69de29
+--- /dev/null
++++ b/{filename}
+@@ -0,0 +1 @@
++PR content
+"""
+    package_pr = ownerA_client.create_gitea_pr("mypool/pkgA", diff, "Test Replace Merge (Conflict)", False, base_branch=merge_branch_name)
+    package_pr_number = package_pr["number"]
+    
+    # Enable "Allow edits from maintainers"
+    ownerA_client.update_gitea_pr_properties("mypool/pkgA", package_pr_number, allow_maintainer_edit=True)
+    
+    # 2. Create a content conflict by committing the same file to the base branch
+    gitea_env.create_file("mypool", "pkgA", filename, "Conflicting base content\n", branch=merge_branch_name)
+
+    project_pr_number = gitea_env.wait_for_project_pr("mypool/pkgA", package_pr_number)
+    assert project_pr_number is not None
+
+    # Before merge, get the head sha of the package pr and project pr
+    pkg_details = gitea_env.get_pr_details("mypool/pkgA", package_pr_number)
+    pkg_head_sha = pkg_details["head"]["sha"]
+    prj_details = gitea_env.get_pr_details("myproducts/mySLFO", project_pr_number)
+    prj_head_sha = prj_details["head"]["sha"]
+
+    pkg_merged, prj_merged = gitea_env.approve_and_wait_merge("mypool/pkgA", package_pr_number, project_pr_number, timeout=60)
+    assert pkg_merged and prj_merged
+    print("Replace merge successful.")
+
+    # Verify that the project branch HEAD is a merge commit
+    branch_info = gitea_env._request("GET", f"repos/myproducts/mySLFO/branches/{merge_branch_name}").json()
+    new_head_sha = branch_info["commit"]["id"]
+    
+    commit_details = gitea_env._request("GET", f"repos/myproducts/mySLFO/git/commits/{new_head_sha}").json()
+    assert len(commit_details["parents"]) > 1, f"Project branch {merge_branch_name} HEAD should be a merge commit but has {len(commit_details['parents'])} parents"
+
+    # Verify that pkgA submodule points to the correct SHA
+    pkgA_submodule_info = gitea_env.get_file_info("myproducts", "mySLFO", "pkgA", branch=merge_branch_name)
+    assert pkgA_submodule_info["sha"] == pkg_head_sha, f"Submodule pkgA should point to {pkg_head_sha} but points to {pkgA_submodule_info['sha']}"
+
+@pytest.mark.t012
+def test_012_merge_mode_devel_ff_success(merge_devel_env, ownerA_client):
+    """
+    Test MergeMode "devel" - Success case (No Conflict, should fast-forward)
+    """
+    gitea_env, test_full_repo_name, merge_branch_name = merge_devel_env
+
+    ts = time.strftime("%H%M%S")
+    filename = f"devel_ff_test_{ts}.txt"
+
+    # 1. Create a package PR (this will be FF-mergeable by default)
+    diff = f"""diff --git a/{filename} b/{filename}
+new file mode 100644
+index 0000000..e69de29
+--- /dev/null
++++ b/{filename}
+@@ -0,0 +1 @@
++PR content
+"""
+    package_pr = ownerA_client.create_gitea_pr("mypool/pkgA", diff, "Test Devel FF Merge", False, base_branch=merge_branch_name)
+    package_pr_number = package_pr["number"]
+    
+    project_pr_number = gitea_env.wait_for_project_pr("mypool/pkgA", package_pr_number)
+    assert project_pr_number is not None
+
+    pkg_details = gitea_env.get_pr_details("mypool/pkgA", package_pr_number)
+    pkg_head_sha = pkg_details["head"]["sha"]
+
+    pkg_merged, prj_merged = gitea_env.approve_and_wait_merge("mypool/pkgA", package_pr_number, project_pr_number)
+    assert pkg_merged and prj_merged
+    print("Devel FF merge successful.")
+
+    # Verify that the package base branch HEAD is the same as the PR head (FF)
+    branch_info = gitea_env._request("GET", f"repos/mypool/pkgA/branches/{merge_branch_name}").json()
+    new_head_sha = branch_info["commit"]["id"]
+    assert new_head_sha == pkg_head_sha, f"Package branch {merge_branch_name} HEAD should be {pkg_head_sha} but is {new_head_sha}"
+    
+    commit_details = gitea_env._request("GET", f"repos/mypool/pkgA/git/commits/{new_head_sha}").json()
+    assert len(commit_details["parents"]) == 1, f"Package branch {merge_branch_name} HEAD should have 1 parent but has {len(commit_details['parents'])}"
+
+@pytest.mark.t013
+def test_013_merge_mode_replace_ff_success(merge_replace_env, ownerA_client):
+    """
+    Test MergeMode "replace" - Success case (No Conflict, should fast-forward)
+    """
+    gitea_env, test_full_repo_name, merge_branch_name = merge_replace_env
+
+    ts = time.strftime("%H%M%S")
+    filename = f"replace_ff_test_{ts}.txt"
+
+    # 1. Create a package PR (this will be FF-mergeable by default)
+    diff = f"""diff --git a/{filename} b/{filename}
+new file mode 100644
+index 0000000..e69de29
+--- /dev/null
++++ b/{filename}
+@@ -0,0 +1 @@
++PR content
+"""
+    package_pr = ownerA_client.create_gitea_pr("mypool/pkgA", diff, "Test Replace FF Merge", False, base_branch=merge_branch_name)
+    package_pr_number = package_pr["number"]
+    
+    project_pr_number = gitea_env.wait_for_project_pr("mypool/pkgA", package_pr_number)
+    assert project_pr_number is not None
+
+    pkg_details = gitea_env.get_pr_details("mypool/pkgA", package_pr_number)
+    pkg_head_sha = pkg_details["head"]["sha"]
+
+    pkg_merged, prj_merged = gitea_env.approve_and_wait_merge("mypool/pkgA", package_pr_number, project_pr_number)
+    assert pkg_merged and prj_merged
+    print("Replace FF merge successful.")
+
+    # Verify that the package base branch HEAD is the same as the PR head (FF)
+    branch_info = gitea_env._request("GET", f"repos/mypool/pkgA/branches/{merge_branch_name}").json()
+    new_head_sha = branch_info["commit"]["id"]
+    assert new_head_sha == pkg_head_sha, f"Package branch {merge_branch_name} HEAD should be {pkg_head_sha} but is {new_head_sha}"
+    
+    commit_details = gitea_env._request("GET", f"repos/mypool/pkgA/git/commits/{new_head_sha}").json()
+    assert len(commit_details["parents"]) == 1, f"Package branch {merge_branch_name} HEAD should have 1 parent but has {len(commit_details['parents'])}"
+    

integration/tests/workflow_pr_review_test.py

@@ -15,22 +15,24 @@ def test_001_review_requests_matching_config(automerge_env, ownerA_client):
     """
     gitea_env, test_full_repo_name, branch_name = automerge_env
 
-    # 1. Create a package PR for pool/pkgB as ownerA
-    diff = """diff --git a/pkgB_test_001.txt b/pkgB_test_001.txt
+    # 1. Create a package PR for mypool/pkgB as ownerA
+    ts = int(time.time() * 1000)
+    filename = f"pkgB_test_{ts}.txt"
+    diff = f"""diff --git a/{filename} b/{filename}
 new file mode 100644
 index 0000000..e69de29
 """
-    print(f"--- Creating package PR in pool/pkgB on branch {branch_name} as ownerA ---")
-    package_pr = ownerA_client.create_gitea_pr("pool/pkgB", diff, "Test Review Requests Config", True, base_branch=branch_name)
+    print(f"--- Creating package PR in mypool/pkgB on branch {branch_name} as ownerA ---")
+    package_pr = ownerA_client.create_gitea_pr("mypool/pkgB", diff, "Test Review Requests Config", True, base_branch=branch_name)
     package_pr_number = package_pr["number"]
-    print(f"Created package PR pool/pkgB#{package_pr_number}")
+    print(f"Created package PR mypool/pkgB#{package_pr_number}")
 
     # 2. Check that review requests came to ownerB, ownerBB, usera, and userb
     print("Checking for review requests from maintainers and workflow.config...")
     reviewers_requested = set()
     expected_reviewers = {"ownerB", "ownerBB", "usera", "userb"}
     for _ in range(30):
-        reviews = gitea_env.list_reviews("pool/pkgB", package_pr_number)
+        reviews = gitea_env.list_reviews("mypool/pkgB", package_pr_number)
         reviewers_requested = {r["user"]["login"] for r in reviews if r["state"] == "REQUEST_REVIEW"}
         if expected_reviewers.issubset(reviewers_requested):
             break
@@ -61,9 +63,9 @@ def test_004_maintainer(maintainer_env, ownerA_client):
     # 0.1 Verify all users from config exist
     print("--- Verifying all users from config exist ---")
     import json
-    wf_file = gitea_env.get_file_info("products", "SLFO", "workflow.config", branch=branch_name)
+    wf_file = gitea_env.get_file_info("myproducts", "mySLFO", "workflow.config", branch=branch_name)
     wf = json.loads(base64.b64decode(wf_file["content"]).decode("utf-8"))
-    mt_file = gitea_env.get_file_info("products", "SLFO", "_maintainership.json", branch=branch_name)
+    mt_file = gitea_env.get_file_info("myproducts", "mySLFO", "_maintainership.json", branch=branch_name)
     mt = json.loads(base64.b64decode(mt_file["content"]).decode("utf-8"))
     
     expected_users = set()
@@ -80,35 +82,21 @@ def test_004_maintainer(maintainer_env, ownerA_client):
         print(f"Verified user exists: {username}")
 
     # 1. Create a package PR as ownerA
-    diff = """diff --git a/maintainer_test_fixture.txt b/maintainer_test_fixture.txt
+    ts = int(time.time() * 1000)
+    filename = f"maintainer_test_{ts}.txt"
+    diff = f"""diff --git a/{filename} b/{filename}
 new file mode 100644
 index 0000000..e69de29
 """
-    print(f"--- Creating package PR in pool/pkgA on branch {branch_name} as ownerA ---")
-    package_pr = ownerA_client.create_gitea_pr("pool/pkgA", diff, "Test Maintainer Merge", True, base_branch=branch_name)
+    print(f"--- Creating package PR in mypool/pkgA on branch {branch_name} as ownerA ---")
+    package_pr = ownerA_client.create_gitea_pr("mypool/pkgA", diff, "Test Maintainer Merge", True, base_branch=branch_name)
     package_pr_number = package_pr["number"]
-    print(f"Created package PR pool/pkgA#{package_pr_number}")
+    print(f"Created package PR mypool/pkgA#{package_pr_number}")
 
     # 2. Make sure the workflow-pr service created related project PR
-    project_pr_number = None
-    print(f"Polling pool/pkgA PR #{package_pr_number} timeline for forwarded PR event...")
-    for _ in range(40):
-        time.sleep(1)
-        timeline_events = gitea_env.get_timeline_events("pool/pkgA", package_pr_number)
-        for event in timeline_events:
-            if event.get("type") == "pull_ref":
-                if not (ref_issue := event.get("ref_issue")):
-                    continue
-                url_to_check = ref_issue.get("html_url", "")
-                match = re.search(r"products/SLFO/pulls/(\d+)", url_to_check)
-                if match:
-                    project_pr_number = int(match.group(1))
-                    break
-        if project_pr_number:
-            break
-    
+    project_pr_number = gitea_env.wait_for_project_pr("mypool/pkgA", package_pr_number)
     assert project_pr_number is not None, "Workflow bot did not create a project PR."
-    print(f"Found project PR: products/SLFO#{project_pr_number}")
+    print(f"Found project PR: myproducts/mySLFO#{project_pr_number}")
 
     # 3. Make sure both PRs are merged automatically WITHOUT manual approvals
     print("Polling for PR merge status (only bot approval allowed)...")
@@ -118,39 +106,40 @@ index 0000000..e69de29
     for i in range(15): # Poll for up to 15 seconds
         # Package PR
         if not package_merged:
-            pkg_details = gitea_env.get_pr_details("pool/pkgA", package_pr_number)
+            pkg_details = gitea_env.get_pr_details("mypool/pkgA", package_pr_number)
             if pkg_details.get("merged"):
                 package_merged = True
-                print(f"Package PR pool/pkgA#{package_pr_number} merged.")
+                print(f"Package PR mypool/pkgA#{package_pr_number} merged.")
             else:
                 # Approve ONLY bot if requested
-                reviews = gitea_env.list_reviews("pool/pkgA", package_pr_number)
+                reviews = gitea_env.list_reviews("mypool/pkgA", package_pr_number)
                 if any(r["state"] == "REQUEST_REVIEW" and r["user"]["login"] == "autogits_obs_staging_bot" for r in reviews):
-                    gitea_env.approve_requested_reviews("pool/pkgA", package_pr_number)
+                    gitea_env.approve_requested_reviews("mypool/pkgA", package_pr_number)
         
         # Project PR
         if not project_merged:
-            prj_details = gitea_env.get_pr_details("products/SLFO", project_pr_number)
+            prj_details = gitea_env.get_pr_details("myproducts/mySLFO", project_pr_number)
             if prj_details.get("merged"):
                 project_merged = True
-                print(f"Project PR products/SLFO#{project_pr_number} merged.")
+                print(f"Project PR myproducts/mySLFO#{project_pr_number} merged.")
             else:
                 # Approve ONLY bot if requested
-                reviews = gitea_env.list_reviews("products/SLFO", project_pr_number)
+                reviews = gitea_env.list_reviews("myproducts/mySLFO", project_pr_number)
                 if any(r["state"] == "REQUEST_REVIEW" and r["user"]["login"] == "autogits_obs_staging_bot" for r in reviews):
-                    gitea_env.approve_requested_reviews("products/SLFO", project_pr_number)
+                    gitea_env.approve_requested_reviews("myproducts/mySLFO", project_pr_number)
         
         if package_merged and project_merged:
             break
             
         time.sleep(1)
             
-    assert package_merged, f"Package PR pool/pkgA#{package_pr_number} was not merged automatically."
-    assert project_merged, f"Project PR products/SLFO#{project_pr_number} was not merged automatically."
+    assert package_merged, f"Package PR mypool/pkgA#{package_pr_number} was not merged automatically."
+    assert project_merged, f"Project PR myproducts/mySLFO#{project_pr_number} was not merged automatically."
     print("Both PRs merged successfully by maintainer rule.")
 
 
 @pytest.mark.t005
+# @pytest.mark.xfail(reason="TBD troubleshoot")
 def test_005_any_maintainer_approval_sufficient(maintainer_env, ownerA_client, ownerBB_client):
     """
     Test scenario:
@@ -161,42 +150,28 @@ def test_005_any_maintainer_approval_sufficient(maintainer_env, ownerA_client, o
     """
     gitea_env, test_full_repo_name, branch_name = maintainer_env
 
-    # 1. Create a package PR for pool/pkgB as ownerA
-    diff = """diff --git a/pkgB_test_fixture.txt b/pkgB_test_fixture.txt
+    # 1. Create a package PR for mypool/pkgB as ownerA
+    ts = int(time.time() * 1000)
+    filename = f"pkgB_test_{ts}.txt"
+    diff = f"""diff --git a/{filename} b/{filename}
 new file mode 100644
 index 0000000..e69de29
 """
-    print(f"--- Creating package PR in pool/pkgB on branch {branch_name} as ownerA ---")
-    package_pr = ownerA_client.create_gitea_pr("pool/pkgB", diff, "Test Single Maintainer Merge", True, base_branch=branch_name)
+    print(f"--- Creating package PR in mypool/pkgB on branch {branch_name} as ownerA ---")
+    package_pr = ownerA_client.create_gitea_pr("mypool/pkgB", diff, "Test Single Maintainer Merge", True, base_branch=branch_name)
     package_pr_number = package_pr["number"]
-    print(f"Created package PR pool/pkgB#{package_pr_number}")
+    print(f"Created package PR mypool/pkgB#{package_pr_number}")
 
     # 2. Make sure the workflow-pr service created related project PR
-    project_pr_number = None
-    print(f"Polling pool/pkgB PR #{package_pr_number} timeline for forwarded PR event...")
-    for _ in range(40):
-        time.sleep(1)
-        timeline_events = gitea_env.get_timeline_events("pool/pkgB", package_pr_number)
-        for event in timeline_events:
-            if event.get("type") == "pull_ref":
-                if not (ref_issue := event.get("ref_issue")):
-                    continue
-                url_to_check = ref_issue.get("html_url", "")
-                match = re.search(r"products/SLFO/pulls/(\d+)", url_to_check)
-                if match:
-                    project_pr_number = int(match.group(1))
-                    break
-        if project_pr_number:
-            break
-    
+    project_pr_number = gitea_env.wait_for_project_pr("mypool/pkgB", package_pr_number)
     assert project_pr_number is not None, "Workflow bot did not create a project PR."
-    print(f"Found project PR: products/SLFO#{project_pr_number}")
+    print(f"Found project PR: myproducts/mySLFO#{project_pr_number}")
 
     # 3. Check that review requests came to ownerB and ownerBB
     print("Checking for review requests from ownerB and ownerBB...")
     reviewers_requested = set()
     for _ in range(20):
-        reviews = gitea_env.list_reviews("pool/pkgB", package_pr_number)
+        reviews = gitea_env.list_reviews("mypool/pkgB", package_pr_number)
         reviewers_requested = {r["user"]["login"] for r in reviews if r["state"] == "REQUEST_REVIEW"}
         if "ownerB" in reviewers_requested and "ownerBB" in reviewers_requested:
             break
@@ -208,41 +183,21 @@ index 0000000..e69de29
 
     # 4. ownerBB leaves review, ownerB does not.
     print("ownerBB approving the PR...")
-    ownerBB_client.create_review("pool/pkgB", package_pr_number, event="APPROVED", body="Approval from ownerBB")
+    ownerBB_client.create_review("mypool/pkgB", package_pr_number, event="APPROVED", body="Approval from ownerBB")
 
-    # 5. Check that both PRs are merged automatically
-    print("Polling for PR merge status (only bot approval allowed for project PR)...")
-    package_merged = False
-    project_merged = False
-    
-    for i in range(15): # Poll for up to 15 seconds
-        # Package PR
-        if not package_merged:
-            pkg_details = gitea_env.get_pr_details("pool/pkgB", package_pr_number)
-            if pkg_details.get("merged"):
-                package_merged = True
-                print(f"Package PR pool/pkgB#{package_pr_number} merged.")
-        
-        # Project PR
-        if not project_merged:
-            prj_details = gitea_env.get_pr_details("products/SLFO", project_pr_number)
-            if prj_details.get("merged"):
-                project_merged = True
-                print(f"Project PR products/SLFO#{project_pr_number} merged.")
-            else:
-                # Approve ONLY bot if requested
-                reviews = gitea_env.list_reviews("products/SLFO", project_pr_number)
-                if any(r["state"] == "REQUEST_REVIEW" and r["user"]["login"] == "autogits_obs_staging_bot" for r in reviews):
-                    gitea_env.approve_requested_reviews("products/SLFO", project_pr_number)
-        
-        if package_merged and project_merged:
-            break
-            
+    # 5. Check that review request for ownerB is removed
+    print("Polling for ownerB review request removal...")
+    ownerB_removed = False
+    for _ in range(30):
         time.sleep(1)
-            
-    assert package_merged, f"Package PR pool/pkgB#{package_pr_number} was not merged automatically."
-    assert project_merged, f"Project PR products/SLFO#{project_pr_number} was not merged automatically."
-    print("Both PRs merged successfully with only one maintainer approval.")
+        reviews = gitea_env.list_reviews("mypool/pkgB", package_pr_number)
+        reviewers_requested = {r["user"]["login"] for r in reviews if r["state"] == "REQUEST_REVIEW"}
+        if "ownerB" not in reviewers_requested:
+            ownerB_removed = True
+            break
+    
+    assert ownerB_removed, f"ownerB review request was not removed after ownerBB approval. Current requested: {reviewers_requested}"
+    print("Confirmed: ownerB review request removed after single maintainer approval.")
 
 
 @pytest.mark.t006
@@ -257,37 +212,39 @@ def test_006_maintainer_rejection_removes_other_requests(maintainer_env, ownerA_
     """
     gitea_env, test_full_repo_name, branch_name = maintainer_env
 
-    # 1. Create a package PR for pool/pkgB as ownerA
-    diff = """diff --git a/pkgB_rejection_test.txt b/pkgB_rejection_test.txt
+    # 1. Create a package PR for mypool/pkgB as ownerA
+    ts = int(time.time() * 1000)
+    filename = f"pkgB_rejection_test_{ts}.txt"
+    diff = f"""diff --git a/{filename} b/{filename}
 new file mode 100644
 index 0000000..e69de29
 """
-    print(f"--- Creating package PR in pool/pkgB on branch {branch_name} as ownerA ---")
-    package_pr = ownerA_client.create_gitea_pr("pool/pkgB", diff, "Test Maintainer Rejection", True, base_branch=branch_name)
+    print(f"--- Creating package PR in mypool/pkgB on branch {branch_name} as ownerA ---")
+    package_pr = ownerA_client.create_gitea_pr("mypool/pkgB", diff, "Test Maintainer Rejection", True, base_branch=branch_name)
     package_pr_number = package_pr["number"]
-    print(f"Created package PR pool/pkgB#{package_pr_number}")
+    print(f"Created package PR mypool/pkgB#{package_pr_number}")
 
     # 2. Check that review requests came to ownerB and ownerBB
     print("Checking for review requests from ownerB and ownerBB...")
     for _ in range(20):
-        reviews = gitea_env.list_reviews("pool/pkgB", package_pr_number)
+        reviews = gitea_env.list_reviews("mypool/pkgB", package_pr_number)
         reviewers_requested = {r["user"]["login"] for r in reviews if r["state"] == "REQUEST_REVIEW"}
         if "ownerB" in reviewers_requested and "ownerBB" in reviewers_requested:
             break
         time.sleep(1)
     else:
-        reviews = gitea_env.list_reviews("pool/pkgB", package_pr_number)
+        reviews = gitea_env.list_reviews("mypool/pkgB", package_pr_number)
         reviewers_requested = {r["user"]["login"] for r in reviews if r["state"] == "REQUEST_REVIEW"}
         pytest.fail(f"ownerB and ownerBB were not both requested. Got: {reviewers_requested}")
 
     # 3. ownerBB rejects the PR
     print("ownerBB rejecting the PR...")
-    ownerBB_client.create_review("pool/pkgB", package_pr_number, event="REQUEST_CHANGES", body="Rejecting from ownerBB")
+    ownerBB_client.create_review("mypool/pkgB", package_pr_number, event="REQUEST_CHANGES", body="Rejecting from ownerBB")
 
     # 4. Check that review request for ownerB is removed
     print("Checking if ownerB's review request is removed...")
     for _ in range(20):
-        reviews = gitea_env.list_reviews("pool/pkgB", package_pr_number)
+        reviews = gitea_env.list_reviews("mypool/pkgB", package_pr_number)
         reviewers_requested = {r["user"]["login"] for r in reviews if r["state"] == "REQUEST_REVIEW"}
         if "ownerB" not in reviewers_requested:
             print("Confirmed: ownerB's review request was removed.")
@@ -315,67 +272,53 @@ def test_007_review_required_needs_all_approvals(review_required_env, ownerA_cli
     ownerA_client._request("GET", "users/admin")
     print(f"ownerA_client smoke test passed")
 
-    # 1. Create a package PR for pool/pkgB as ownerA
-    diff = """diff --git a/pkgB_review_required_test.txt b/pkgB_review_required_test.txt
+    # 1. Create a package PR for mypool/pkgB as ownerA
+    ts = int(time.time() * 1000)
+    filename = f"pkgB_review_required_test_{ts}.txt"
+    diff = f"""diff --git a/{filename} b/{filename}
 new file mode 100644
 index 0000000..e69de29
 """
-    print(f"--- Creating package PR in pool/pkgB on branch {branch_name} as ownerA ---")
-    package_pr = ownerA_client.create_gitea_pr("pool/pkgB", diff, "Test Review Required", True, base_branch=branch_name)
+    print(f"--- Creating package PR in mypool/pkgB on branch {branch_name} as ownerA ---")
+    package_pr = ownerA_client.create_gitea_pr("mypool/pkgB", diff, "Test Review Required", True, base_branch=branch_name)
     package_pr_number = package_pr["number"]
-    print(f"Created package PR pool/pkgB#{package_pr_number}")
+    print(f"Created package PR mypool/pkgB#{package_pr_number}")
 
     # 2. Make sure the workflow-pr service created related project PR
-    project_pr_number = None
-    print(f"Polling pool/pkgB PR #{package_pr_number} timeline for forwarded PR event...")
-    for _ in range(40):
-        time.sleep(1)
-        timeline_events = gitea_env.get_timeline_events("pool/pkgB", package_pr_number)
-        for event in timeline_events:
-            if event.get("type") == "pull_ref":
-                if not (ref_issue := event.get("ref_issue")):
-                    continue
-                url_to_check = ref_issue.get("html_url", "")
-                match = re.search(r"products/SLFO/pulls/(\d+)", url_to_check)
-                if match:
-                    project_pr_number = int(match.group(1))
-                    break
-        if project_pr_number:
-            break
-    
+    project_pr_number = gitea_env.wait_for_project_pr("mypool/pkgB", package_pr_number)
     assert project_pr_number is not None, "Workflow bot did not create a project PR."
-    print(f"Found project PR: products/SLFO#{project_pr_number}")
+    print(f"Found project PR: myproducts/mySLFO#{project_pr_number}")
 
     # 3. Check that review requests came to ownerB and ownerBB
     print("Checking for review requests from ownerB and ownerBB...")
     for _ in range(20):
-        reviews = gitea_env.list_reviews("pool/pkgB", package_pr_number)
+        reviews = gitea_env.list_reviews("mypool/pkgB", package_pr_number)
         reviewers_requested = {r["user"]["login"] for r in reviews if r["state"] == "REQUEST_REVIEW"}
         if "ownerB" in reviewers_requested and "ownerBB" in reviewers_requested:
             break
         time.sleep(1)
     else:
-        reviews = gitea_env.list_reviews("pool/pkgB", package_pr_number)
+        reviews = gitea_env.list_reviews("mypool/pkgB", package_pr_number)
         reviewers_requested = {r["user"]["login"] for r in reviews if r["state"] == "REQUEST_REVIEW"}
         pytest.fail(f"ownerB and ownerBB were not both requested. Got: {reviewers_requested}")
 
     # 4. ownerBB leaves review, ownerB does not.
     print("ownerBB approving the PR...")
-    ownerBB_client.create_review("pool/pkgB", package_pr_number, event="APPROVED", body="Approval from ownerBB")
+    ownerBB_client.create_review("mypool/pkgB", package_pr_number, event="APPROVED", body="Approval from ownerBB")
 
     # 5. Check that the PR is NOT merged automatically and ownerB request remains
     print("Waiting to ensure PR is NOT merged and ownerB request remains...")
     for i in range(10):
-        pkg_details = gitea_env.get_pr_details("pool/pkgB", package_pr_number)
-        reviews = gitea_env.list_reviews("pool/pkgB", package_pr_number)
+        pkg_details = gitea_env.get_pr_details("mypool/pkgB", package_pr_number)
+        reviews = gitea_env.list_reviews("mypool/pkgB", package_pr_number)
         review_states = [(r["user"]["login"], r["state"]) for r in reviews]
         print(f"Attempt {i+1}: Merged={pkg_details.get('merged')}, Reviews={review_states}")
         time.sleep(2)
     
-    pkg_details = gitea_env.get_pr_details("pool/pkgB", package_pr_number)
+    pkg_details = gitea_env.get_pr_details("mypool/pkgB", package_pr_number)
     assert not pkg_details.get("merged"), "Package PR was merged automatically but it should NOT have been (ReviewRequired=true)."
     
-    reviews = gitea_env.list_reviews("pool/pkgB", package_pr_number)
+    reviews = gitea_env.list_reviews("mypool/pkgB", package_pr_number)
     reviewers_requested = {r["user"]["login"] for r in reviews if r["state"] == "REQUEST_REVIEW"}
     assert "ownerB" in reviewers_requested, f"ownerB's review request was removed, but it should have remained. All reviews: {[(r['user']['login'], r['state']) for r in reviews]}"
     

integration/tests/workflow_pr_sync_test.py

@@ -23,35 +23,16 @@ pytest.forwarded_pr_number = None
 def test_001_project_pr(gitea_env):
     """Forwarded PR correct title"""
     diff = "diff --git a/another_test.txt b/another_test.txt\nnew file mode 100644\nindex 0000000..e69de29\n"
-    pytest.pr = gitea_env.create_gitea_pr("pool/pkgA", diff, "Test PR", False)
+    pytest.pr = gitea_env.create_gitea_pr("mypool/pkgA", diff, "Test PR", False)
     pytest.initial_pr_number = pytest.pr["number"]
     time.sleep(5) # Give Gitea some time to process the PR and make the timeline available
 
-    compose_dir = Path(__file__).parent.parent
-
-    pytest.forwarded_pr_number = None
-    print(
-        f"Polling pool/pkgA PR #{pytest.initial_pr_number} timeline for forwarded PR event..."
-    )
-    # Instead of polling timeline, check if forwarded PR exists directly
-    for _ in range(20):
-        time.sleep(1)
-        timeline_events = gitea_env.get_timeline_events("pool/pkgA", pytest.initial_pr_number)
-        for event in timeline_events:
-            if event.get("type") == "pull_ref":
-                if not (ref_issue := event.get("ref_issue")):
-                    continue
-                url_to_check = ref_issue.get("html_url", "")
-                match = re.search(r"products/SLFO/pulls/(\d+)", url_to_check)
-                if match:
-                    pytest.forwarded_pr_number = match.group(1)
-                    break
-        if pytest.forwarded_pr_number:
-            break
+    pytest.forwarded_pr_number = gitea_env.wait_for_project_pr("mypool/pkgA", pytest.initial_pr_number)
+    
     assert (
         pytest.forwarded_pr_number is not None
     ), "Workflow bot did not create a forwarded PR."
-    pytest.pr_details = gitea_env.get_pr_details("products/SLFO", pytest.forwarded_pr_number)
+    pytest.pr_details = gitea_env.get_pr_details("myproducts/mySLFO", pytest.forwarded_pr_number)
     assert (
         pytest.pr_details["title"] == "Forwarded PRs: pkgA"
     ), "Forwarded PR correct title"
@@ -62,13 +43,13 @@ def test_001_project_pr(gitea_env):
 def test_002_updated_project_pr(gitea_env):
     """Forwarded PR head is updated"""
     diff = "diff --git a/another_test.txt b/another_test.txt\nnew file mode 100444\nindex 0000000..e69de21\n"
-    gitea_env.modify_gitea_pr("pool/pkgA", pytest.initial_pr_number, diff, "Tweaks")
+    gitea_env.modify_gitea_pr("mypool/pkgA", pytest.initial_pr_number, diff, "Tweaks")
     sha_old = pytest.pr_details["head"]["sha"]
 
     sha_changed = False
     for _ in range(20):
         time.sleep(1)
-        new_pr_details = gitea_env.get_pr_details("products/SLFO", pytest.forwarded_pr_number)
+        new_pr_details = gitea_env.get_pr_details("myproducts/mySLFO", pytest.forwarded_pr_number)
         sha_new = new_pr_details["head"]["sha"]
         if sha_new != sha_old:
             print(f"Sha changed from {sha_old} to {sha_new}")
@@ -82,17 +63,17 @@ def test_002_updated_project_pr(gitea_env):
 @pytest.mark.dependency(depends=["test_001_project_pr"])
 def test_003_wip(gitea_env):
     """WIP flag set for PR"""
-    # 1. set WIP flag in PR f"pool/pkgA#{pytest.initial_pr_number}"
-    initial_pr_details = gitea_env.get_pr_details("pool/pkgA", pytest.initial_pr_number)
+    # 1. set WIP flag in PR f"mypool/pkgA#{pytest.initial_pr_number}"
+    initial_pr_details = gitea_env.get_pr_details("mypool/pkgA", pytest.initial_pr_number)
     wip_title = "WIP: " + initial_pr_details["title"]
 
-    gitea_env.update_gitea_pr_properties("pool/pkgA", pytest.initial_pr_number, title=wip_title)
-    # 2. in loop check whether WIP flag is set for PR f"products/SLFO #{pytest.forwarded_pr_number}"
+    gitea_env.update_gitea_pr_properties("mypool/pkgA", pytest.initial_pr_number, title=wip_title)
+    # 2. in loop check whether WIP flag is set for PR f"myproducts/mySLFO #{pytest.forwarded_pr_number}"
     wip_flag_set = False
     for _ in range(20):
         time.sleep(1)
         forwarded_pr_details = gitea_env.get_pr_details(
-            "products/SLFO", pytest.forwarded_pr_number
+            "myproducts/mySLFO", pytest.forwarded_pr_number
         )
         if "WIP: " in forwarded_pr_details["title"]:
             wip_flag_set = True
@@ -100,19 +81,19 @@ def test_003_wip(gitea_env):
 
     assert wip_flag_set, "WIP flag was not set in the forwarded PR."
 
-    # Remove WIP flag from PR f"pool/pkgA#{pytest.initial_pr_number}"
-    initial_pr_details = gitea_env.get_pr_details("pool/pkgA", pytest.initial_pr_number)
+    # Remove WIP flag from PR f"mypool/pkgA#{pytest.initial_pr_number}"
+    initial_pr_details = gitea_env.get_pr_details("mypool/pkgA", pytest.initial_pr_number)
     non_wip_title = initial_pr_details["title"].replace("WIP: ", "")
     gitea_env.update_gitea_pr_properties(
-        "pool/pkgA", pytest.initial_pr_number, title=non_wip_title
+        "mypool/pkgA", pytest.initial_pr_number, title=non_wip_title
     )
 
-    # In loop check whether WIP flag is removed for PR f"products/SLFO #{pytest.forwarded_pr_number}"
+    # In loop check whether WIP flag is removed for PR f"myproducts/mySLFO #{pytest.forwarded_pr_number}"
     wip_flag_removed = False
     for _ in range(20):
         time.sleep(1)
         forwarded_pr_details = gitea_env.get_pr_details(
-            "products/SLFO", pytest.forwarded_pr_number
+            "myproducts/mySLFO", pytest.forwarded_pr_number
         )
         if "WIP: " not in forwarded_pr_details["title"]:
             wip_flag_removed = True
@@ -121,7 +102,7 @@ def test_003_wip(gitea_env):
 
 
 @pytest.mark.t005
-@pytest.mark.xfail(reason="works only in ibs_state branch?")
+@pytest.mark.skip(reason="works only in ibs_state branch?")
 @pytest.mark.dependency()
 def test_005_NoProjectGitPR_edits_disabled(no_project_git_pr_env, test_user_client):
     """
@@ -139,37 +120,23 @@ index 0000000..e69de29
 @@ -0,0 +1 @@
 +Initial content
 """
-    package_pr = test_user_client.create_gitea_pr("pool/pkgA", initial_diff, "Test PR for No Project PR, No Edits", False, base_branch=dev_branch_name)
+    package_pr = test_user_client.create_gitea_pr("mypool/pkgA", initial_diff, "Test PR for No Project PR, No Edits", False, base_branch=dev_branch_name)
     package_pr_number = package_pr["number"]
     print(f"Created Package PR #{package_pr_number}")
 
     # 2. Verify that the workflow-pr bot did not create a Project PR
-    project_pr_created = False
-    for i in range(10): # Poll for some time
-        time.sleep(2)
-        timeline_events = gitea_env.get_timeline_events("pool/pkgA", package_pr_number)
-        for event in timeline_events:
-            if event.get("type") == "pull_ref":
-                if not (ref_issue := event.get("ref_issue")):
-                    continue
-                url_to_check = ref_issue.get("html_url", "")
-                match = re.search(r"products/SLFO/pulls/(\d+)", url_to_check)
-                if match:
-                    project_pr_created = True
-                    break
-        if project_pr_created:
-            break
+    project_pr_number = gitea_env.wait_for_project_pr("mypool/pkgA", package_pr_number, timeout=10)
     
-    assert not project_pr_created, "Workflow bot unexpectedly created a Project PR in products/SLFO."
+    assert project_pr_number is None, "Workflow bot unexpectedly created a Project PR in myproducts/mySLFO."
     print("Verification complete: No Project PR was created by the bot.")
 
     # 3. Manually create the Project PR
-    pkgA_main_sha = gitea_env._request("GET", f"repos/pool/pkgA/branches/{dev_branch_name}").json()["commit"]["id"]
-    package_pr_details = gitea_env.get_pr_details("pool/pkgA", package_pr_number)
+    pkgA_main_sha = gitea_env._request("GET", f"repos/mypool/pkgA/branches/{dev_branch_name}").json()["commit"]["id"]
+    package_pr_details = gitea_env.get_pr_details("mypool/pkgA", package_pr_number)
     pkgA_pr_head_sha = package_pr_details["head"]["sha"]
 
     project_pr_title = "Forwarded PRs: pkgA (Manual)"
-    project_pr_body = f"Manual Project PR for NoProjectGitPR. \nPR: pool/pkgA!{package_pr_number}"
+    project_pr_body = f"Manual Project PR for NoProjectGitPR. \nPR: mypool/pkgA!{package_pr_number}"
     project_pr_diff = f"""diff --git a/pkgA b/pkgA
 index {pkgA_main_sha[:7]}..{pkgA_pr_head_sha[:7]} 160000
 --- a/pkgA
@@ -199,14 +166,14 @@ index 0000000..e69de29
 @@ -0,0 +1 @@
 +Trigger content
 """
-    test_user_client.modify_gitea_pr("pool/pkgA", package_pr_number, new_diff_content, "Trigger bot update")
+    test_user_client.modify_gitea_pr("mypool/pkgA", package_pr_number, new_diff_content, "Trigger bot update")
 
     # 5. Verify that the bot adds a warning comment because it cannot update the manual PR (edits disabled)
     warning_found = False
     print(f"Polling Package PR #{package_pr_number} for warning comment...")
     for _ in range(20):
         time.sleep(3)
-        comments = gitea_env.get_comments("pool/pkgA", package_pr_number)
+        comments = gitea_env.get_comments("mypool/pkgA", package_pr_number)
         for comment in comments:
             # According to test-plan.md, the warning explains that it cannot update the PR.
             if "cannot update" in comment.get("body", "").lower():
@@ -221,7 +188,7 @@ index 0000000..e69de29
 
 
 @pytest.mark.t006
-@pytest.mark.xfail(reason="works only in ibs_state branch?")
+@pytest.mark.skip(reason="works only in ibs_state branch?")
 @pytest.mark.dependency()
 def test_006_NoProjectGitPR_edits_enabled(no_project_git_pr_env, test_user_client):
     """
@@ -239,42 +206,27 @@ index 0000000..e69de29
 @@ -0,0 +1 @@
 +New feature content
 """
-    package_pr = test_user_client.create_gitea_pr("pool/pkgA", diff, "Test PR for NoProjectGitPR", False, base_branch=dev_branch_name)
+    package_pr = test_user_client.create_gitea_pr("mypool/pkgA", diff, "Test PR for NoProjectGitPR", False, base_branch=dev_branch_name)
     package_pr_number = package_pr["number"]
     
     # Enable "Allow edits from maintainers"
-    test_user_client.update_gitea_pr_properties("pool/pkgA", package_pr_number, allow_maintainer_edit=True)
+    test_user_client.update_gitea_pr_properties("mypool/pkgA", package_pr_number, allow_maintainer_edit=True)
     print(f"Created Package PR #{package_pr_number} and enabled 'Allow edits from maintainers'.")
 
     # Get SHAs needed for the manual Project PR diff
-    pkgA_main_sha = gitea_env._request("GET", f"repos/pool/pkgA/branches/{dev_branch_name}").json()["commit"]["id"]
-    package_pr_details = gitea_env.get_pr_details("pool/pkgA", package_pr_number)
+    pkgA_main_sha = gitea_env._request("GET", f"repos/mypool/pkgA/branches/{dev_branch_name}").json()["commit"]["id"]
+    package_pr_details = gitea_env.get_pr_details("mypool/pkgA", package_pr_number)
     pkgA_pr_head_sha = package_pr_details["head"]["sha"]
 
-    # 3. Assert that the workflow-pr bot did not create a Project PR in the products/SLFO repository
-    project_pr_created = False
-    for i in range(20): # Poll for a reasonable time
-        time.sleep(2) # Wait a bit longer to be sure
-        timeline_events = gitea_env.get_timeline_events("pool/pkgA", package_pr_number)
-        for event in timeline_events:
-            if event.get("type") == "pull_ref":
-                if not (ref_issue := event.get("ref_issue")):
-                    continue
-                url_to_check = ref_issue.get("html_url", "")
-                # Regex now searches for products/SLFO/pulls/(\d+)
-                match = re.search(r"products/SLFO/pulls/(\d+)", url_to_check)
-                if match:
-                    project_pr_created = True
-                    break
-        if project_pr_created:
-            break
+    # 3. Assert that the workflow-pr bot did not create a Project PR in the myproducts/mySLFO repository
+    project_pr_number = gitea_env.wait_for_project_pr("mypool/pkgA", package_pr_number, timeout=10)
     
-    assert not project_pr_created, "Workflow bot unexpectedly created a Project PR in products/SLFO."
-    print("Verification complete: No Project PR was created in products/SLFO as expected.")
+    assert project_pr_number is None, "Workflow bot unexpectedly created a Project PR in myproducts/mySLFO."
+    print("Verification complete: No Project PR was created in myproducts/mySLFO as expected.")
 
     # 1. Create that Project PR from the test code.
     project_pr_title = "Forwarded PRs: pkgA"
-    project_pr_body = f"Test Project PR for NoProjectGitPR. \nPR: pool/pkgA!{package_pr_number}"
+    project_pr_body = f"Test Project PR for NoProjectGitPR. \nPR: mypool/pkgA!{package_pr_number}"
     project_pr_diff = f"""diff --git a/pkgA b/pkgA
 index {pkgA_main_sha[:7]}..{pkgA_pr_head_sha[:7]} 160000
 --- a/pkgA
@@ -304,7 +256,7 @@ index 0000000..f587a12
 @@ -0,0 +1 @@
 +Another file content
 """
-    test_user_client.modify_gitea_pr("pool/pkgA", package_pr_number, new_diff_content, "Add another file to Package PR")
+    test_user_client.modify_gitea_pr("mypool/pkgA", package_pr_number, new_diff_content, "Add another file to Package PR")
     print(f"Added new commit to Package PR #{package_pr_number}.")
     time.sleep(5) # Give the bot time to react
 
@@ -322,5 +274,3 @@ index 0000000..f587a12
     
     assert project_pr_updated, "Manually created Project PR was not updated by the bot."
     print("Verification complete: Manually created Project PR was updated by the bot as expected.")
-
-

integration/workflow-pr/entrypoint.sh

@@ -19,8 +19,8 @@ export GITEA_TOKEN
 echo "GITEA_TOKEN exported (length: ${#GITEA_TOKEN})"
 
 # Wait for the dummy data to be created by the gitea setup script
-echo "Waiting for workflow.config in products/SLFO..."
-API_URL="http://gitea-test:3000/api/v1/repos/products/SLFO/contents/workflow.config"
+echo "Waiting for workflow.config in myproducts/mySLFO..."
+API_URL="http://gitea-test:3000/api/v1/repos/myproducts/mySLFO/contents/workflow.config"
 HTTP_STATUS=$(curl -s -o /dev/null -w "%{http_code}" -H "Authorization: token $GITEA_TOKEN" "$API_URL")
 
 while [ "$HTTP_STATUS" != "200" ]; do

integration/workflow-pr/workflow-pr.json

@@ -1,8 +1,13 @@
 [
-    "products/SLFO#main",
-    "products/SLFO#dev",
-    "products/SLFO#merge",
-    "products/SLFO#maintainer-merge",
-    "products/SLFO#review-required",
-    "products/SLFO#label-test"
+    "myproducts/mySLFO#main",
+    "myproducts/mySLFO#staging-main",
+    "myproducts/mySLFO#dev",
+    "myproducts/mySLFO#merge",
+    "myproducts/mySLFO#maintainer-merge",
+    "myproducts/mySLFO#review-required",
+    "myproducts/mySLFO#label-test",
+    "myproducts/mySLFO#manual-merge",
+    "myproducts/mySLFO#merge-ff",
+    "myproducts/mySLFO#merge-replace",
+    "myproducts/mySLFO#merge-devel"
 ]

obs-staging-bot/main.go

@@ -131,6 +131,10 @@ func ProcessBuildStatus(project *common.BuildResultList) BuildStatusSummary {
 	found:
 		for j := 0; j < len(project.Result); j++ {
 			common.LogDebug("  found match for @ idx:", j)
+			if project.Result[i].Dirty {
+				// ignore possible temporary failures and wait for settling
+				return BuildStatusSummaryBuilding
+			}
 			res := ProcessRepoBuildStatus(project.Result[i].Status)
 			switch res {
 			case BuildStatusSummarySuccess:
@@ -873,8 +877,11 @@ func ProcessPullRequest(obs common.ObsClientInterface, gitea common.Gitea, org,
 			// NOTE: this is user input, so we need some limits here
 			l := len(stagingConfig.ObsProject)
 			if l >= len(stagingConfig.StagingProject) || stagingConfig.ObsProject != stagingConfig.StagingProject[0:l] {
-				common.LogError("StagingProject (", stagingConfig.StagingProject, ") is not child of target project", stagingConfig.ObsProject)
-				return true, nil
+				// TEMPORARY HACK: We remove this when Factory has switched to git
+				if ( stagingConfig.ObsProject != "openSUSE:Factory:git" && stagingConfig.StagingProject != "openSUSE:Factory:PullRequest" ) {
+					common.LogError("StagingProject (", stagingConfig.StagingProject, ") is not child of target project", stagingConfig.ObsProject)
+					return true, nil
+				}
 			}
 		}
 
@@ -1039,6 +1046,7 @@ func ProcessPullRequest(obs common.ObsClientInterface, gitea common.Gitea, org,
 				}
 			}
 		}
+
 		switch overallBuildStatus {
 		case BuildStatusSummarySuccess:
 			status.Status = common.CommitStatus_Success
@@ -1163,6 +1171,7 @@ var IsDryRun bool
 var ProcessPROnly string
 var ObsClient common.ObsClientInterface
 var BotUser string
+var PollInterval = 5 * time.Minute
 
 func ObsWebHostFromApiHost(apihost string) string {
 	u, err := url.Parse(apihost)
@@ -1185,9 +1194,18 @@ func main() {
 	flag.StringVar(&ObsApiHost, "obs", "", "API for OBS instance")
 	flag.StringVar(&ObsWebHost, "obs-web", "", "Web OBS instance, if not derived from the obs config")
 	flag.BoolVar(&IsDryRun, "dry", false, "Dry-run, don't actually create any build projects or review changes")
+	pollIntervalStr := flag.String("poll-interval", common.GetEnvOverrideString(os.Getenv("AUTOGITS_STAGING_BOT_POLL_INTERVAL"), ""), "Polling interval for notifications (e.g. 5m, 10s)")
 	debug := flag.Bool("debug", false, "Turns on debug logging")
 	flag.Parse()
 
+	if len(*pollIntervalStr) > 0 {
+		if d, err := time.ParseDuration(*pollIntervalStr); err == nil {
+			PollInterval = d
+		} else {
+			common.LogError("Invalid poll interval:", err)
+		}
+	}
+
 	if *debug {
 		common.SetLoggingLevel(common.LogLevelDebug)
 	} else {
@@ -1256,6 +1274,6 @@ func main() {
 	for {
 		PollWorkNotifications(ObsClient, gitea)
 		common.LogInfo("Poll cycle finished")
-		time.Sleep(5 * time.Minute)
+		time.Sleep(PollInterval)
 	}
 }

workflow-pr/README.md

@@ -54,6 +54,7 @@ This is the ProjectGit config file. For runtime config file, see bottom.
 | *GitProjectName* | Repository and branch where the ProjectGit lives. | no | string | **Format**: `org/project_repo#branch` | By default assumes `_ObsPrj` with default branch in the *Organization* |
 | *ManualMergeOnly* | Merges are permitted only upon receiving a "merge ok" comment from designated maintainers in the PkgGit PR. | no | bool | true, false | false |
 | *ManualMergeProject* | Merges are permitted only upon receiving a "merge ok" comment in the ProjectGit PR from project maintainers. | no | bool | true, false | false |
+| *MergeMode* | Type of package merge accepted. See below for details. | no | string | ff-only, replace, devel | ff-only |
 | *ReviewRequired* | If submitter is a maintainer, require review from another maintainer if available. | no | bool | true, false | false |
 | *NoProjectGitPR* | Do not create PrjGit PR, but still perform other tasks. | no | bool | true, false | false |
 | *Reviewers* | PrjGit reviewers. Additional review requests are triggered for associated PkgGit PRs. PrjGit PR is merged only when all reviews are complete. | no | array of strings | | `[]` |
@@ -96,6 +97,19 @@ Package Deletion Requests
   If you wish to re-add a package, create a new PrjGit PR which adds again the submodule on the branch that has the "-removed" suffix. The bot will automatically remove this suffix from the project branch in the pool.
 
 
+Merge Modes
+-----------
+
+| Merge Mode | Description
+|------------|--------------------------------------------------------------------------------
+| ff-only    | Only allow --ff-only merges in the package branch. This is best suited for
+|            | devel projects and openSUSE Tumbleweed development, where history should be linear
+| replace    | Merge is done via `-X theirs` strategy and old files are removed in the merge.
+|            | This works well for downstream codestreams, like Leap, that would update their branch
+|            | using latest version.
+| devel      | No merge, just set the project branch to PR HEAD. This is suitable for downstream
+|            | projects like Leap during development cycle, where keeping maintenance history is not important
+
 Labels
 ------
 
@@ -104,8 +118,6 @@ The following labels are used, when defined in Repo/Org.
 | Label Config Entry | Default label  | Description
 |--------------------|----------------|----------------------------------------
 | StagingAuto        | staging/Auto   | Assigned to Project Git PRs when first staged
-| ReviewPending      | review/Pending | Assigned to Project Git PR when package reviews are still pending
-| ReviewDone         | review/Done    | Assigned to Project Git PR when reviews are complete on all package PRs
 
 
 Maintainership

workflow-pr/pr_processor.go

@@ -309,14 +309,17 @@ func (pr *PRProcessor) UpdatePrjGitPR(prset *common.PRSet) error {
 	PrjGit := PrjGitPR.PR.Base.Repo
 	prjGitPRbranch := PrjGitPR.PR.Head.Name
 	if PrjGitPR.PR.Base.RepoID != PrjGitPR.PR.Head.RepoID {
-		PrjGitPR.RemoteName, err = git.GitClone(common.DefaultGitPrj, "", PrjGit.SSHURL)
-		git.GitExecOrPanic(common.DefaultGitPrj, "fetch", PrjGitPR.RemoteName, PrjGitPR.PR.Head.Sha)
-		git.GitExecOrPanic(common.DefaultGitPrj, "checkout", PrjGitPR.PR.Head.Sha)
-		common.LogInfo("Cannot update this PR as it's on another remote, not branch:", prjGitPRbranch, "Assuming this is by-design. (eg. project git PR only)")
-		return nil
+		// permission check, if submission comes from foreign repo
+		if !PrjGitPR.PR.AllowMaintainerEdit {
+			// well, wrong place...
+			// common.LogError("Warning: source and target branch are in different repositories. We may not have the right permissions...")
+			//		Gitea.AddComment(PrjGitPR.PR, "This PR does not allow maintainer changes, but referenced package branch has changed!")
+			return nil
+		}
 	}
 
-	PrjGitPR.RemoteName, err = git.GitClone(common.DefaultGitPrj, prjGitPRbranch, PrjGit.SSHURL)
+	//	PrjGitPR.RemoteName, err = git.GitClone(common.DefaultGitPrj, prjGitPRbranch, PrjGit.SSHURL)
+	PrjGitPR.RemoteName, err = git.GitClone(common.DefaultGitPrj, PrjGitPR.PR.Head.Ref, PrjGitPR.PR.Head.Repo.SSHURL)
 	common.PanicOnError(err)
 	git.GitExecOrPanic(common.DefaultGitPrj, "fetch", PrjGitPR.RemoteName, PrjGitBranch)
 
@@ -364,6 +367,7 @@ func (pr *PRProcessor) UpdatePrjGitPR(prset *common.PRSet) error {
 			}
 			common.PanicOnError(git.GitExec(common.DefaultGitPrj, params...))
 			PrjGitPR.PR.Head.Sha = newHeadCommit
+			Gitea.SetLabels(PrjGit.Owner.UserName, PrjGit.Name, PrjGitPR.PR.Index, []string{prset.Config.Label("PR/updated")})
 		}
 
 		// update PR
@@ -413,6 +417,12 @@ func (pr *PRProcessor) Process(req *models.PullRequest) error {
 	}
 	common.LogInfo("fetched PRSet of size:", len(prset.PRs))
 
+	if !prset.PrepareForMerge(git) {
+		common.LogError("PRs are NOT mergeable.")
+	} else {
+		common.LogInfo("PRs are in mergeable state.")
+	}
+
 	prjGitPRbranch := prGitBranchNameForPR(prRepo, prNo)
 	prjGitPR, err := prset.GetPrjGitPR()
 	if err == common.PRSet_PrjGitMissing {
@@ -466,7 +476,8 @@ func (pr *PRProcessor) Process(req *models.PullRequest) error {
 				if pr.PR.State == "open" {
 					org, repo, idx := pr.PRComponents()
 					if prjGitPR.PR.HasMerged {
-						Gitea.AddComment(pr.PR, "This PR is merged via the associated Project PR.")
+						// TODO: use timeline here because this can spam if ManualMergePR fails
+						// Gitea.AddComment(pr.PR, "This PR is merged via the associated Project PR.")
 						err = Gitea.ManualMergePR(org, repo, idx, pr.PR.Head.Sha, false)
 						if _, ok := err.(*repository.RepoMergePullRequestConflict); !ok {
 							common.PanicOnError(err)

workflow-pr/pr_processor_opened_test.go

@@ -128,6 +128,7 @@ func TestOpenPR(t *testing.T) {
 		mockGit.EXPECT().GitClone(gomock.Any(), gomock.Any(), gomock.Any()).Return("origin", nil).AnyTimes()
 		mockGit.EXPECT().GitBranchHead(gomock.Any(), gomock.Any()).Return("head", nil).AnyTimes()
 		mockGit.EXPECT().GitSubmoduleList(gomock.Any(), gomock.Any()).Return(map[string]string{"testRepo": "testing"}, nil).AnyTimes()
+		mockGit.EXPECT().GitExecOrPanic(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()
 		mockGit.EXPECT().GitExecOrPanic(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()
 		mockGit.EXPECT().GitCatFile(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil, nil).AnyTimes()
 		mockGit.EXPECT().Close().Return(nil).AnyTimes()
@@ -187,6 +188,7 @@ func TestOpenPR(t *testing.T) {
 		mockGit.EXPECT().GitClone(gomock.Any(), gomock.Any(), gomock.Any()).Return("origin", nil).AnyTimes()
 		mockGit.EXPECT().GitBranchHead(gomock.Any(), gomock.Any()).Return("head", nil).AnyTimes()
 		mockGit.EXPECT().GitSubmoduleList(gomock.Any(), gomock.Any()).Return(map[string]string{"testRepo": "testing"}, nil).AnyTimes()
+		mockGit.EXPECT().GitExecOrPanic(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()
 		mockGit.EXPECT().GitExecOrPanic(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()
 		mockGit.EXPECT().GitCatFile(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil, nil).AnyTimes()
 		mockGit.EXPECT().Close().Return(nil).AnyTimes()
@@ -236,6 +238,7 @@ func TestOpenPR(t *testing.T) {
 		mockGit.EXPECT().GitClone(gomock.Any(), gomock.Any(), gomock.Any()).Return("origin", nil).AnyTimes()
 		mockGit.EXPECT().GitBranchHead(gomock.Any(), gomock.Any()).Return("head", nil).AnyTimes()
 		mockGit.EXPECT().GitSubmoduleList(gomock.Any(), gomock.Any()).Return(map[string]string{"testRepo": "testing"}, nil).AnyTimes()
+		mockGit.EXPECT().GitExecOrPanic(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()
 		mockGit.EXPECT().GitExecOrPanic(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()
 		mockGit.EXPECT().GitCatFile(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil, nil).AnyTimes()
                 gitea.EXPECT().RequestReviews(gomock.Any(), gomock.Any()).Return(nil, nil).AnyTimes()
@@ -289,6 +292,7 @@ func TestOpenPR(t *testing.T) {
 		mockGit.EXPECT().GitClone(gomock.Any(), gomock.Any(), gomock.Any()).Return("origin", nil).AnyTimes()
 		mockGit.EXPECT().GitBranchHead(gomock.Any(), gomock.Any()).Return("head", nil).AnyTimes()
 		mockGit.EXPECT().GitSubmoduleList(gomock.Any(), gomock.Any()).Return(map[string]string{"testRepo": "testing"}, nil).AnyTimes()
+		mockGit.EXPECT().GitExecOrPanic(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()
 		mockGit.EXPECT().GitExecOrPanic(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()
 		mockGit.EXPECT().GitCatFile(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil, nil).AnyTimes()
 		mockGit.EXPECT().Close().Return(nil).AnyTimes()
@@ -343,6 +347,7 @@ func TestOpenPR(t *testing.T) {
 		mockGit.EXPECT().GitClone(gomock.Any(), gomock.Any(), gomock.Any()).Return("origin", nil).AnyTimes()
 		mockGit.EXPECT().GitBranchHead(gomock.Any(), gomock.Any()).Return("head", nil).AnyTimes()
 		mockGit.EXPECT().GitSubmoduleList(gomock.Any(), gomock.Any()).Return(map[string]string{"testRepo": "testing"}, nil).AnyTimes()
+		mockGit.EXPECT().GitExecOrPanic(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()
 		mockGit.EXPECT().GitExecOrPanic(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()
 		mockGit.EXPECT().GitCatFile(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil, nil).AnyTimes()
 		mockGit.EXPECT().Close().Return(nil).AnyTimes()

workflow-pr/pr_processor_test.go

@@ -396,7 +396,62 @@ func TestUpdatePrjGitPR(t *testing.T) {
 							Name:   "feature",
 							RepoID: 2, // Different RepoID
 							Sha:    "sha1",
+							Repo: &models.Repository{
+								SSHURL: "url",
+							},
 						},
+						User:                &models.User{UserName: "someone"},
+						Mergeable:           true,
+						AllowMaintainerEdit: true,
+					},
+				},
+				{
+					PR: &models.PullRequest{
+						State: "open",
+						Base: &models.PRBranchInfo{
+							Name: "other",
+							Repo: &models.Repository{
+								Name:  "other-pkg",
+								Owner: &models.User{UserName: "test-org"},
+							},
+						},
+						Head: &models.PRBranchInfo{
+							Sha: "other-sha",
+						},
+					},
+				},
+			},
+		}
+		mockGit.EXPECT().GitClone(common.DefaultGitPrj, gomock.Any(), gomock.Any()).Return("remote2", nil)
+		mockGit.EXPECT().GitExecOrPanic(common.DefaultGitPrj, "fetch", "remote2", "main")
+		mockGit.EXPECT().GitBranchHead(common.DefaultGitPrj, gomock.Any()).Return("sha1", nil).Times(2)
+		mockGit.EXPECT().GitSubmoduleList(common.DefaultGitPrj, "HEAD").Return(map[string]string{"other-pkg": "other-sha"}, nil)
+
+		err := processor.UpdatePrjGitPR(prset)
+		if err != nil {
+			t.Errorf("Unexpected error: %v", err)
+		}
+	})
+
+	t.Run("PR on another remote - not allowed", func(t *testing.T) {
+		prset := &common.PRSet{
+			Config: config,
+			PRs: []*common.PRInfo{
+				{
+					PR: &models.PullRequest{
+						Base: &models.PRBranchInfo{
+							Name:   "main",
+							RepoID: 1,
+							Repo: &models.Repository{
+								Name:  "test-prj",
+								Owner: &models.User{UserName: "test-org"},
+							},
+						},
+						Head: &models.PRBranchInfo{
+							Name:   "feature",
+							RepoID: 2, // Different RepoID
+						},
+						AllowMaintainerEdit: false,
 					},
 				},
 				{
@@ -412,10 +467,6 @@ func TestUpdatePrjGitPR(t *testing.T) {
 				},
 			},
 		}
-		mockGit.EXPECT().GitClone(gomock.Any(), gomock.Any(), gomock.Any()).Return("remote2", nil)
-		mockGit.EXPECT().GitExecOrPanic(gomock.Any(), "fetch", "remote2", "sha1")
-		mockGit.EXPECT().GitExecOrPanic(gomock.Any(), "checkout", "sha1")
-
 		err := processor.UpdatePrjGitPR(prset)
 		if err != nil {
 			t.Errorf("Unexpected error: %v", err)
@@ -445,6 +496,9 @@ func TestUpdatePrjGitPR(t *testing.T) {
 							Name:   "PR_branch",
 							RepoID: 1,
 							Sha:    "old-head",
+							Repo: &models.Repository{
+								SSHURL: "url",
+							},
 						},
 					},
 				},
@@ -483,6 +537,7 @@ func TestUpdatePrjGitPR(t *testing.T) {
 		mockGit.EXPECT().GitStatus(gomock.Any()).Return(nil, nil).AnyTimes()
 
 		// UpdatePullRequest expectation
+		gitea.EXPECT().SetLabels(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(nil, nil).AnyTimes()
 		gitea.EXPECT().UpdatePullRequest(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(nil, nil).AnyTimes()
 
 		err := processor.UpdatePrjGitPR(prset)
@@ -514,6 +569,9 @@ func TestUpdatePrjGitPR(t *testing.T) {
 							Name:   "PR_branch",
 							RepoID: 1,
 							Sha:    "head",
+							Repo: &models.Repository{
+								SSHURL: "url",
+							},
 						},
 					},
 				},
@@ -724,7 +782,10 @@ func TestPRProcessor_Process_EdgeCases(t *testing.T) {
 		gitea.EXPECT().FetchMaintainershipFile(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil, "", nil).AnyTimes()
 		gitea.EXPECT().FetchMaintainershipDirFile(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(nil, "", nil).AnyTimes()
 		// Mock expectations for the merged path
-		mockGit.EXPECT().GitClone(gomock.Any(), gomock.Any(), gomock.Any()).Return("origin", nil)
+		mockGit.EXPECT().GitClone(gomock.Any(), gomock.Any(), gomock.Any()).Return("origin", nil).AnyTimes()
+		mockGit.EXPECT().GitExecOrPanic(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()
+		mockGit.EXPECT().GitExecOrPanic(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()
+		mockGit.EXPECT().GitExec(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).AnyTimes()
 		mockGit.EXPECT().GitSubmoduleList(gomock.Any(), gomock.Any()).Return(map[string]string{"pkg-a": "old-sha"}, nil).AnyTimes()
 		gitea.EXPECT().GetRecentCommits(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return([]*models.Commit{{SHA: "pkg-sha"}}, nil).AnyTimes()
 
@@ -892,6 +953,10 @@ func TestProcessFunc(t *testing.T) {
 		mockGit.EXPECT().GetPath().Return("/tmp").AnyTimes()
 		mockGit.EXPECT().Close().Return(nil)
 
+		mockGit.EXPECT().GitClone(gomock.Any(), gomock.Any(), gomock.Any()).Return("origin", nil).AnyTimes()
+		mockGit.EXPECT().GitExecOrPanic(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()
+		mockGit.EXPECT().GitExecOrPanic(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()
+
 		// Expect Process calls (mocked via mockGit mostly)
 		gitea.EXPECT().GetTimeline(gomock.Any(), gomock.Any(), gomock.Any()).Return([]*models.TimelineComment{}, nil).AnyTimes()
 		gitea.EXPECT().GetPullRequestReviews(gomock.Any(), gomock.Any(), gomock.Any()).Return([]*models.PullReview{}, nil).AnyTimes()

workflow-pr/repo_check_extended_test.go

@@ -185,6 +185,9 @@ func TestDefaultStateChecker_ProcessPR(t *testing.T) {
 	mockGit.EXPECT().GetPath().Return("/tmp").AnyTimes()
 	mockGit.EXPECT().Close().Return(nil)
 
+	mockGit.EXPECT().GitClone(gomock.Any(), gomock.Any(), gomock.Any()).Return("origin", nil).AnyTimes()
+	mockGit.EXPECT().GitExecOrPanic(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()
+
 	// Expectations for ProcesPullRequest
 	gitea.EXPECT().GetPullRequest(gomock.Any(), gomock.Any(), gomock.Any()).Return(pr, nil).AnyTimes()
 	gitea.EXPECT().GetTimeline(gomock.Any(), gomock.Any(), gomock.Any()).Return([]*models.TimelineComment{}, nil).AnyTimes()