Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug 1896964 - Cleanup firefox-android repo references #1000

Merged
merged 42 commits into from
Jun 11, 2024

Conversation

gbrownmozilla
Copy link
Contributor

@gbrownmozilla gbrownmozilla commented May 17, 2024

Remove all references to the firefox-android and staging-firefox-android repos.

@gbrownmozilla gbrownmozilla marked this pull request as ready for review May 17, 2024 23:58
"allowed_actions": ["release"],
"github_token": "SOME_TOKEN",
"github_owner": "mozilla-mobile",
"github_repo_name": "firefox-android",
"github_repo_name": "reference-browser",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reference-browser does not actually use githubscript. I've replaced firefox-android with reference-browser in examples and tests just to provide the name of an active github repo; open to suggestions for a better approach!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we remove the mobile bits entirely and use an example from xpi instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes!

Copy link
Contributor

@jcristau jcristau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for cleaning this up :)

beetmoverscript/docker.d/worker.yml Show resolved Hide resolved
"allowed_actions": ["release"],
"github_token": "SOME_TOKEN",
"github_owner": "mozilla-mobile",
"github_repo_name": "firefox-android",
"github_repo_name": "reference-browser",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we remove the mobile bits entirely and use an example from xpi instead?

signingscript/docker.d/passwords.yml Show resolved Hide resolved
"fenix": MobileVersion,
"firefox-android": MobileVersion,
"focus-android": MobileVersion,
"placeholder-repo": MobileVersion, # not currently used
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason to not just remove the unused code?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I'm not sure I understand what you had in mind. I removed that placeholder-repo line - it didn't add value. Were you thinking of removing _VERSION_CLASS_PER_END_OF_SOURCE_REPO? I've left it thinking that it's generic and might be useful again.
Of course treescript/github is also entirely unused now, but I think that's useful in the foreseeable future. Removing that, or cleaning up the github tests further, seems to get a little complicated; I wouldn't mind leaving that for a follow-up.

Copy link
Contributor

@jcristau jcristau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks.

I think we'll want to remove the beetmover mobile pools and the githubscript mobile prod pool from https://github.com/mozilla-services/cloudops-infra/blob/master/projects/relengworker/Jenkinsfile and https://github.com/mozilla-services/cloudops-infra/blob/master/projects/relengworker/Jenkinsfile.dev before deploying this, to avoid failed deploys.

tests/test_init.py Show resolved Hide resolved
jcristau and others added 18 commits June 11, 2024 13:37
Calling `random.sample()` on a dict_keys object no longer works

```
FAILED tests/test_aio.py::test_LockfileFuture[True] - TypeError: Population must be a sequence.  For dicts or sets, use sorted(d).
FAILED tests/test_aio.py::test_LockfileFuture[False] - TypeError: Population must be a sequence.  For dicts or sets, use sorted(d).
```

https://docs.python.org/3/whatsnew/3.11.html#porting-to-python-3-11
```
FAILED tests/test_utils.py::test_pipe_to_log - TypeError: Passing coroutines is forbidden, use tasks explicitly.
```

Per https://docs.python.org/3.11/library/asyncio-task.html#asyncio.wait:
"Changed in version 3.11: Passing coroutine objects to wait() directly is forbidden."
Assumes dependencies are the same or close enough to those on 3.9, at
least until we move everything from 3.9 to 3.11.
updates:
- [github.com/astral-sh/ruff-pre-commit: v0.4.4 → v0.4.5](astral-sh/ruff-pre-commit@v0.4.4...v0.4.5)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Initially I didn't bother splitting these out because I figured they
both require the exact same permissions on the repo anyway. So if the
dev app secret were compromised, you'd be just as hosed as if the prod
app secret were compromised.

However, it didn't occur to me that we might only install the `dev` app
on staging repos and that we don't want a bug on treescript-dev to
accidentally expose the `prod` app's private key.

To this end, I created a `releng-treescript-dev` app. We should probably
avoid installing this app on production repos, and instead only add it
to `staging-*` repos. To help with this, I restricted the app to the
`mozilla-releng` org.
This assumes dependencies are the same or close enough as on python 3.9.
…0.4.2 (mozilla-releng#1018)

* pushflatpakscript: Run on python 3.11, update flat-manager-client to 0.4.2

* pushflatpakscript: more changes to switch to python 3.11

---------

Co-authored-by: Julien Cristau <jcristau@mozilla.com>
…ozilla-releng#1015)

* feat(treescript): Add support for fetching head revision with github client

Mostly a refactor of existing code.

* feat(treescript): Allow git and hg configuration simultaneously

* feat(treescript): Enable git for Firefox treescript

* refactor(treescript): Only bump l10n in merge day action when an l10n_bump action is also present

This moves the decision about bumping l10n up to a higher level, which simplifies adding support for bumpning via github in the next commit.

* feat(treescript): Add support for fetching l10n revisions from github.

Most of this is copy/paste to avoid touching any of the existing l10n bumping code.

The most notable change is in build_revision_dict_github, which is vastly simplified compared to its hg compared part. In part this is because we only have one string repo to worry about, but also because @eemeli declared that we don't need to support pinning revisions anymore - so I didn't implement that here. After we cut over to the Github repo and know we aren't going back, we can rip out the hg support.

Most of the rest of this is just wiring in calls to l10n_bump_github when appropriate.

* force treestatus check off for testing

* style: pre-commit.ci auto fixes [...]

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@gbrownmozilla gbrownmozilla merged commit b003a54 into mozilla-releng:master Jun 11, 2024
8 checks passed
Copy link
Contributor

@hneiva hneiva left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

"checks"
],
"priority": "highest",
"priority": "lowest",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

heheh this is a good idea :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants