Dist-git MR's target branch to match source-git MR's target branch #56

majamassarini · 2022-04-06T12:01:55Z

NOTE: tests are failing for the same reason already appeared in #55

Fixes #36

Merge after packit/packit#1555

Related with packit/packit.dev#430

RELEASE NOTES BEGIN

The user can now customize the name of the downstream branch using the downstream_branch_name configuration option.

RELEASE NOTES END

softwarefactory-project-zuul · 2022-04-06T12:11:57Z

Build failed.

pre-commit : SUCCESS in 3m 28s
hardly-tests : FAILURE in 3m 49s

softwarefactory-project-zuul · 2022-04-07T08:55:03Z

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.

softwarefactory-project-zuul · 2022-04-08T12:41:56Z

Build failed.

pre-commit : SUCCESS in 2m 08s
hardly-tests : FAILURE in 2m 26s

softwarefactory-project-zuul · 2022-04-08T13:05:50Z

Build failed.

pre-commit : SUCCESS in 2m 06s
hardly-tests : FAILURE in 2m 23s

jpopelka

I think we should document the downstream_branch_name somewhere. Given that it's hardly specific thing so far, probably in the hardly/README and we can move it somewhere else (packit.dev) later.

EDIT: Actually, we have source-git specific upstream_ref in the docs as well, so can put downstream_branch_name there as well - mentioning that it's for source-git repos.

jpopelka · 2022-04-08T15:06:10Z

hardly/handlers/distgit.py

@@ -89,6 +89,7 @@ def run(self) -> TaskResults:
 Please review the contribution and once you are comfortable with the content,
 you should trigger a CI pipeline run via `Pipelines → Run pipeline`."""
        dg_mr = self.api.sync_release(
+            dist_git_branch=self.package_config.downstream_branch_name,


Just to be sure: so if downstream_branch_name is not specified in the config, nothing changes, i.e. it'll still default to the default branch of the dist-git repository, right?

Yes, because sync_release is called with dist_git_branch=None

This should be changed, so that when donstream_branch_name is not specified use the current source-git branch name as the name of the target branch in dist-git.

softwarefactory-project-zuul · 2022-04-11T08:14:31Z

Build failed.

pre-commit : SUCCESS in 3m 16s
hardly-tests : FAILURE in 3m 39s

csomh · 2022-04-11T08:29:38Z

hardly/handlers/distgit.py

@@ -89,6 +89,7 @@ def run(self) -> TaskResults:
 Please review the contribution and once you are comfortable with the content,
 you should trigger a CI pipeline run via `Pipelines → Run pipeline`."""
        dg_mr = self.api.sync_release(
+            dist_git_branch=self.package_config.downstream_branch_name,


This should be changed, so that when donstream_branch_name is not specified use the current source-git branch name as the name of the target branch in dist-git.

csomh · 2022-04-11T08:32:42Z

Makefile

@@ -23,7 +23,7 @@ check:
 	PYTHONPATH=$(CURDIR) PYTHONDONTWRITEBYTECODE=1 python3 -m pytest --color=$(COLOR) --verbose --showlocals --cov=hardly --cov-report=$(COV_REPORT) $(TEST_TARGET)

 test-image: files/recipe-tests.yaml
-	$(CONTAINER_ENGINE) build --rm -t $(TEST_IMAGE) -f files/Containerfile.tests --build-arg SOURCE_BRANCH=$(SOURCE_BRANCH) .
+	$(CONTAINER_ENGINE) build --no-cache --rm -t $(TEST_IMAGE) -f files/Containerfile.tests --build-arg SOURCE_BRANCH=$(SOURCE_BRANCH) .


This might not be something that is desired in every situation. If you think customization of these options is needed on a regular basis, then we should and a BUILD_OPTIONS variable, or something similar, which could be used in such cases.

Fix/hardly/36 Fixes packit/hardly#36 Merge before packit/hardly#56 RELEASE NOTES BEGIN A new configuration option downstream_branch_name has been added, which is meant to be used in source-git projects and allow users to customize the name of the branch in dist-git which corresponds to the current source-git branch. RELEASE NOTES END Reviewed-by: Jiri Popelka <None> Reviewed-by: Hunor Csomortáni <[email protected]>

softwarefactory-project-zuul · 2022-04-11T09:58:50Z

Build failed.

pre-commit : SUCCESS in 1m 50s
hardly-tests : FAILURE in 1m 58s

csomh · 2022-04-11T10:06:01Z

In packit-service, we don't build the test image every time we run the tests, but we pull it from Quay. Shouldn't this be consistent, and done the same way here, too? @jpopelka what do you think?

jpopelka · 2022-04-11T15:00:54Z

In packit-service we use the pre-built image because building the image takes a long time (it installs all the deps for worker and service and tests).
It has some cons, such as that the tests can fail when the list of dependencies changes, but the pros is the huge speed-up.

In hardly we build the test image on top of worker (until #48) and install only a few libs for tests, which is much faster so it IMHO doesn't make sense to use a pre-built image in this case. But if the build problems don't "go away automagically", then we might, indeed, need to build it in Quay as we do with p-s, because I don't know how to fix them.

csomh · 2022-04-12T07:24:49Z

Thank you for the explanation @jpopelka. I'll reach out to the softwarefactory folks and ask about this issue.

softwarefactory-project-zuul · 2022-04-12T07:41:17Z

Build failed.

pre-commit : SUCCESS in 2m 12s
hardly-tests : FAILURE in 2m 39s

hardly/handlers/distgit.py

csomh · 2022-04-12T07:53:11Z

hardly/handlers/distgit.py

+        if dist_git_branch not in self.api.dg.local_project.git_project.get_branches():
+            msg = f"""
+{self.target_repo}:{dist_git_branch} does not exist.
+A new branch with this name will be created into the downstream repo.
+"""
+            self.project.get_pr(int(self.mr_identifier)).comment(msg)
+
+        return dist_git_branch


Tbh, I wouldn't do this check here. If the branch doesn't exist in dist-git, there is nothing meaningful the bot could do: creating it is a release engineering task, it shouldn't be created on the fly. Another solution could be to set downstream_branch_name, but that's also up to the maintainer to decide.

So if the branch doesn't exist in dist-git, opening the PR should simply fail.

softwarefactory-project-zuul · 2022-04-12T08:30:01Z

Build failed.

pre-commit : SUCCESS in 6m 50s
hardly-tests : FAILURE in 9m 19s

softwarefactory-project-zuul · 2022-04-12T10:23:48Z

Build failed.

pre-commit : SUCCESS in 2m 17s
hardly-tests : FAILURE in 2m 21s

softwarefactory-project-zuul · 2022-04-12T10:31:43Z

Build failed.

pre-commit : SUCCESS in 1m 55s
hardly-tests : FAILURE in 2m 03s

When creating a downstream MR use as target branch name or the same upstream target branch name or a custom one. Co-authored-by: Hunor Csomortáni <[email protected]>

softwarefactory-project-zuul · 2022-04-12T12:14:58Z

Build failed.

pre-commit : SUCCESS in 4m 00s
hardly-tests : FAILURE in 4m 10s

Use downstream_branch_name option

83ad43c

majamassarini force-pushed the fix/hardly/36 branch from bf7bba0 to 83ad43c Compare April 8, 2022 12:38

majamassarini mentioned this pull request Apr 8, 2022

Fix/hardly/36 packit/packit#1555

Merged

majamassarini marked this pull request as ready for review April 8, 2022 12:56

Update release notes in pull request template

3699949

majamassarini requested review from jpopelka and csomh April 8, 2022 13:21

jpopelka reviewed Apr 8, 2022

View reviewed changes

jpopelka approved these changes Apr 8, 2022

View reviewed changes

csomh reviewed Apr 11, 2022

View reviewed changes

majamassarini force-pushed the fix/hardly/36 branch from 2e7a206 to 754eed6 Compare April 11, 2022 09:56

majamassarini force-pushed the fix/hardly/36 branch from 754eed6 to 679af04 Compare April 12, 2022 07:37

csomh reviewed Apr 12, 2022

View reviewed changes

majamassarini force-pushed the fix/hardly/36 branch from 68377f7 to 95e6a81 Compare April 12, 2022 10:20

majamassarini force-pushed the fix/hardly/36 branch from 95e6a81 to 2ce1252 Compare April 12, 2022 10:28

Use upstream target branch name or a custom branch name

bbeec3a

When creating a downstream MR use as target branch name or the same upstream target branch name or a custom one. Co-authored-by: Hunor Csomortáni <[email protected]>

majamassarini force-pushed the fix/hardly/36 branch from 2ce1252 to bbeec3a Compare April 12, 2022 12:08

csomh approved these changes Apr 12, 2022

View reviewed changes

majamassarini merged commit b2c397a into packit:main Apr 13, 2022

jpopelka mentioned this pull request May 9, 2022

Sync to dist-git MR when source-git MR has been closed or reopened #62

Merged

1 task

majamassarini deleted the fix/hardly/36 branch May 12, 2022 12:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Dist-git MR's target branch to match source-git MR's target branch #56

Dist-git MR's target branch to match source-git MR's target branch #56

majamassarini commented Apr 6, 2022 •

edited

Loading

softwarefactory-project-zuul bot commented Apr 6, 2022

softwarefactory-project-zuul bot commented Apr 7, 2022

softwarefactory-project-zuul bot commented Apr 8, 2022

softwarefactory-project-zuul bot commented Apr 8, 2022

jpopelka left a comment •

edited

Loading

jpopelka Apr 8, 2022

majamassarini Apr 11, 2022 •

edited

Loading

csomh Apr 11, 2022

softwarefactory-project-zuul bot commented Apr 11, 2022

csomh Apr 11, 2022

csomh Apr 11, 2022

softwarefactory-project-zuul bot commented Apr 11, 2022

csomh commented Apr 11, 2022

jpopelka commented Apr 11, 2022 •

edited

Loading

csomh commented Apr 12, 2022

softwarefactory-project-zuul bot commented Apr 12, 2022

csomh Apr 12, 2022

softwarefactory-project-zuul bot commented Apr 12, 2022

softwarefactory-project-zuul bot commented Apr 12, 2022

softwarefactory-project-zuul bot commented Apr 12, 2022

softwarefactory-project-zuul bot commented Apr 12, 2022

Dist-git MR's target branch to match source-git MR's target branch #56

Dist-git MR's target branch to match source-git MR's target branch #56

Conversation

majamassarini commented Apr 6, 2022 • edited Loading

softwarefactory-project-zuul bot commented Apr 6, 2022

softwarefactory-project-zuul bot commented Apr 7, 2022

softwarefactory-project-zuul bot commented Apr 8, 2022

softwarefactory-project-zuul bot commented Apr 8, 2022

jpopelka left a comment • edited Loading

Choose a reason for hiding this comment

jpopelka Apr 8, 2022

Choose a reason for hiding this comment

majamassarini Apr 11, 2022 • edited Loading

Choose a reason for hiding this comment

csomh Apr 11, 2022

Choose a reason for hiding this comment

softwarefactory-project-zuul bot commented Apr 11, 2022

csomh Apr 11, 2022

Choose a reason for hiding this comment

csomh Apr 11, 2022

Choose a reason for hiding this comment

softwarefactory-project-zuul bot commented Apr 11, 2022

csomh commented Apr 11, 2022

jpopelka commented Apr 11, 2022 • edited Loading

csomh commented Apr 12, 2022

softwarefactory-project-zuul bot commented Apr 12, 2022

csomh Apr 12, 2022

Choose a reason for hiding this comment

softwarefactory-project-zuul bot commented Apr 12, 2022

softwarefactory-project-zuul bot commented Apr 12, 2022

softwarefactory-project-zuul bot commented Apr 12, 2022

softwarefactory-project-zuul bot commented Apr 12, 2022

majamassarini commented Apr 6, 2022 •

edited

Loading

jpopelka left a comment •

edited

Loading

majamassarini Apr 11, 2022 •

edited

Loading

jpopelka commented Apr 11, 2022 •

edited

Loading