Metrics Collection: Added GALAXY_API_PATH_PREFIX to API call #1939

slemrmartin · 2023-10-17T09:13:22Z

What is this PR doing:

Fixes current API call, which uses only base url and /pulp/api/v3/status and doesn't work on galaxy-dev.

Reviewers must know:

PR Author & Reviewers: Keep or remove backport labels per Backporting Guidelines
Reviewers: Look for sound code, no code smells, docs & test coverage
Merger: When merging, include the Jira issue link in the squashed commit

Jira AA-1892 No-Issue Signed-off-by: Martin Slemr <[email protected]>

galaxy_ng/tests/unit/app/management/commands/analytics/automation_analytics/test_data.py

Jira AA-1892 No-Issue Signed-off-by: Martin Slemr <[email protected]>

slemrmartin · 2023-10-23T12:49:11Z

@rochacbruno the current failing test is not related to this PR, right?

rochacbruno · 2023-10-23T14:38:58Z

/retest

patchback · 2023-10-23T15:33:44Z

Backport to stable-4.2: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply a479d54 on top of patchback/backports/stable-4.2/a479d541388f4cbc8fbfff0a22a5ef54c2024cf4/pr-1939

Backporting merged PR #1939 into master

Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your origin remote.
Make sure you have an upstream repo added as a remote too. In these
instructions you'll refer to it by the name upstream. If you don't
have it, here's how you can add it:
```
$ git remote add upstream https://github.com/ansible/galaxy_ng.git
```

Ensure you have the latest copy of upstream and prepare a branch
that will hold the backported code:

$ git fetch upstream
$ git checkout -b patchback/backports/stable-4.2/a479d541388f4cbc8fbfff0a22a5ef54c2024cf4/pr-1939 upstream/stable-4.2

Now, cherry-pick PR Metrics Collection: Added GALAXY_API_PATH_PREFIX to API call #1939 contents into that branch:
```
$ git cherry-pick -x a479d541388f4cbc8fbfff0a22a5ef54c2024cf4
```
If it'll yell at you with something like fatal: Commit a479d541388f4cbc8fbfff0a22a5ef54c2024cf4 is a merge but no -m option was given., add -m 1 as follows instead:
```
$ git cherry-pick -m1 -x a479d541388f4cbc8fbfff0a22a5ef54c2024cf4
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR Metrics Collection: Added GALAXY_API_PATH_PREFIX to API call #1939 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/stable-4.2/a479d541388f4cbc8fbfff0a22a5ef54c2024cf4/pr-1939

Create a PR, ensure that the CI is green. If it's not — update it so that
the tests and any other checks pass. This is it!
Now relax and wait for the maintainers to process your pull request
when they have some cycles to do reviews. Don't worry — they'll tell you if
any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback · 2023-10-23T15:33:48Z

Backport to stable-4.4: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply a479d54 on top of patchback/backports/stable-4.4/a479d541388f4cbc8fbfff0a22a5ef54c2024cf4/pr-1939

Backporting merged PR #1939 into master

Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your origin remote.
Make sure you have an upstream repo added as a remote too. In these
instructions you'll refer to it by the name upstream. If you don't
have it, here's how you can add it:
```
$ git remote add upstream https://github.com/ansible/galaxy_ng.git
```

Ensure you have the latest copy of upstream and prepare a branch
that will hold the backported code:

$ git fetch upstream
$ git checkout -b patchback/backports/stable-4.4/a479d541388f4cbc8fbfff0a22a5ef54c2024cf4/pr-1939 upstream/stable-4.4

Now, cherry-pick PR Metrics Collection: Added GALAXY_API_PATH_PREFIX to API call #1939 contents into that branch:
```
$ git cherry-pick -x a479d541388f4cbc8fbfff0a22a5ef54c2024cf4
```
If it'll yell at you with something like fatal: Commit a479d541388f4cbc8fbfff0a22a5ef54c2024cf4 is a merge but no -m option was given., add -m 1 as follows instead:
```
$ git cherry-pick -m1 -x a479d541388f4cbc8fbfff0a22a5ef54c2024cf4
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR Metrics Collection: Added GALAXY_API_PATH_PREFIX to API call #1939 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/stable-4.4/a479d541388f4cbc8fbfff0a22a5ef54c2024cf4/pr-1939

Create a PR, ensure that the CI is green. If it's not — update it so that
the tests and any other checks pass. This is it!
Now relax and wait for the maintainers to process your pull request
when they have some cycles to do reviews. Don't worry — they'll tell you if
any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback · 2023-10-23T15:33:53Z

Backport to stable-4.5: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply a479d54 on top of patchback/backports/stable-4.5/a479d541388f4cbc8fbfff0a22a5ef54c2024cf4/pr-1939

Backporting merged PR #1939 into master

Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your origin remote.
Make sure you have an upstream repo added as a remote too. In these
instructions you'll refer to it by the name upstream. If you don't
have it, here's how you can add it:
```
$ git remote add upstream https://github.com/ansible/galaxy_ng.git
```

Ensure you have the latest copy of upstream and prepare a branch
that will hold the backported code:

$ git fetch upstream
$ git checkout -b patchback/backports/stable-4.5/a479d541388f4cbc8fbfff0a22a5ef54c2024cf4/pr-1939 upstream/stable-4.5

Now, cherry-pick PR Metrics Collection: Added GALAXY_API_PATH_PREFIX to API call #1939 contents into that branch:
```
$ git cherry-pick -x a479d541388f4cbc8fbfff0a22a5ef54c2024cf4
```
If it'll yell at you with something like fatal: Commit a479d541388f4cbc8fbfff0a22a5ef54c2024cf4 is a merge but no -m option was given., add -m 1 as follows instead:
```
$ git cherry-pick -m1 -x a479d541388f4cbc8fbfff0a22a5ef54c2024cf4
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR Metrics Collection: Added GALAXY_API_PATH_PREFIX to API call #1939 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/stable-4.5/a479d541388f4cbc8fbfff0a22a5ef54c2024cf4/pr-1939

Create a PR, ensure that the CI is green. If it's not — update it so that
the tests and any other checks pass. This is it!
Now relax and wait for the maintainers to process your pull request
when they have some cycles to do reviews. Don't worry — they'll tell you if
any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback · 2023-10-23T15:33:57Z

Backport to stable-4.6: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply a479d54 on top of patchback/backports/stable-4.6/a479d541388f4cbc8fbfff0a22a5ef54c2024cf4/pr-1939

Backporting merged PR #1939 into master

Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your origin remote.
Make sure you have an upstream repo added as a remote too. In these
instructions you'll refer to it by the name upstream. If you don't
have it, here's how you can add it:
```
$ git remote add upstream https://github.com/ansible/galaxy_ng.git
```

Ensure you have the latest copy of upstream and prepare a branch
that will hold the backported code:

$ git fetch upstream
$ git checkout -b patchback/backports/stable-4.6/a479d541388f4cbc8fbfff0a22a5ef54c2024cf4/pr-1939 upstream/stable-4.6

Now, cherry-pick PR Metrics Collection: Added GALAXY_API_PATH_PREFIX to API call #1939 contents into that branch:
```
$ git cherry-pick -x a479d541388f4cbc8fbfff0a22a5ef54c2024cf4
```
If it'll yell at you with something like fatal: Commit a479d541388f4cbc8fbfff0a22a5ef54c2024cf4 is a merge but no -m option was given., add -m 1 as follows instead:
```
$ git cherry-pick -m1 -x a479d541388f4cbc8fbfff0a22a5ef54c2024cf4
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR Metrics Collection: Added GALAXY_API_PATH_PREFIX to API call #1939 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/stable-4.6/a479d541388f4cbc8fbfff0a22a5ef54c2024cf4/pr-1939

Create a PR, ensure that the CI is green. If it's not — update it so that
the tests and any other checks pass. This is it!
Now relax and wait for the maintainers to process your pull request
when they have some cycles to do reviews. Don't worry — they'll tell you if
any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback · 2023-10-23T15:34:06Z

Backport to stable-4.7: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply a479d54 on top of patchback/backports/stable-4.7/a479d541388f4cbc8fbfff0a22a5ef54c2024cf4/pr-1939

Backporting merged PR #1939 into master

Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your origin remote.
Make sure you have an upstream repo added as a remote too. In these
instructions you'll refer to it by the name upstream. If you don't
have it, here's how you can add it:
```
$ git remote add upstream https://github.com/ansible/galaxy_ng.git
```

Ensure you have the latest copy of upstream and prepare a branch
that will hold the backported code:

$ git fetch upstream
$ git checkout -b patchback/backports/stable-4.7/a479d541388f4cbc8fbfff0a22a5ef54c2024cf4/pr-1939 upstream/stable-4.7

Now, cherry-pick PR Metrics Collection: Added GALAXY_API_PATH_PREFIX to API call #1939 contents into that branch:
```
$ git cherry-pick -x a479d541388f4cbc8fbfff0a22a5ef54c2024cf4
```
If it'll yell at you with something like fatal: Commit a479d541388f4cbc8fbfff0a22a5ef54c2024cf4 is a merge but no -m option was given., add -m 1 as follows instead:
```
$ git cherry-pick -m1 -x a479d541388f4cbc8fbfff0a22a5ef54c2024cf4
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR Metrics Collection: Added GALAXY_API_PATH_PREFIX to API call #1939 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/stable-4.7/a479d541388f4cbc8fbfff0a22a5ef54c2024cf4/pr-1939

Create a PR, ensure that the CI is green. If it's not — update it so that
the tests and any other checks pass. This is it!
Now relax and wait for the maintainers to process your pull request
when they have some cycles to do reviews. Don't worry — they'll tell you if
any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback · 2023-10-23T15:34:10Z

Backport to stable-4.8: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply a479d54 on top of patchback/backports/stable-4.8/a479d541388f4cbc8fbfff0a22a5ef54c2024cf4/pr-1939

Backporting merged PR #1939 into master

Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your origin remote.
Make sure you have an upstream repo added as a remote too. In these
instructions you'll refer to it by the name upstream. If you don't
have it, here's how you can add it:
```
$ git remote add upstream https://github.com/ansible/galaxy_ng.git
```

Ensure you have the latest copy of upstream and prepare a branch
that will hold the backported code:

$ git fetch upstream
$ git checkout -b patchback/backports/stable-4.8/a479d541388f4cbc8fbfff0a22a5ef54c2024cf4/pr-1939 upstream/stable-4.8

Now, cherry-pick PR Metrics Collection: Added GALAXY_API_PATH_PREFIX to API call #1939 contents into that branch:
```
$ git cherry-pick -x a479d541388f4cbc8fbfff0a22a5ef54c2024cf4
```
If it'll yell at you with something like fatal: Commit a479d541388f4cbc8fbfff0a22a5ef54c2024cf4 is a merge but no -m option was given., add -m 1 as follows instead:
```
$ git cherry-pick -m1 -x a479d541388f4cbc8fbfff0a22a5ef54c2024cf4
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR Metrics Collection: Added GALAXY_API_PATH_PREFIX to API call #1939 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/stable-4.8/a479d541388f4cbc8fbfff0a22a5ef54c2024cf4/pr-1939

Create a PR, ensure that the CI is green. If it's not — update it so that
the tests and any other checks pass. This is it!
Now relax and wait for the maintainers to process your pull request
when they have some cycles to do reviews. Don't worry — they'll tell you if
any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

rochacbruno approved these changes Oct 17, 2023

View reviewed changes

slemrmartin marked this pull request as draft October 17, 2023 12:16

slemrmartin force-pushed the fix-metrics-collection-api-call branch from 0fd3a9a to 2255a1e Compare October 17, 2023 12:24

slemrmartin marked this pull request as ready for review October 17, 2023 12:24

slemrmartin force-pushed the fix-metrics-collection-api-call branch 4 times, most recently from 638c37c to 9d903f2 Compare October 18, 2023 10:49

slemrmartin closed this Oct 18, 2023

slemrmartin reopened this Oct 18, 2023

slemrmartin closed this Oct 18, 2023

slemrmartin reopened this Oct 18, 2023

slemrmartin force-pushed the fix-metrics-collection-api-call branch 4 times, most recently from 5c9214b to 0c5aadd Compare October 18, 2023 13:52

Metrics Collection: Added GALAXY_API_PATH_PREFIX to API call

1d69f0a

Jira AA-1892 No-Issue Signed-off-by: Martin Slemr <[email protected]>

slemrmartin force-pushed the fix-metrics-collection-api-call branch from 0c5aadd to 2c9c383 Compare October 19, 2023 12:38

rochacbruno reviewed Oct 19, 2023

View reviewed changes

galaxy_ng/tests/unit/app/management/commands/analytics/automation_analytics/test_data.py Show resolved Hide resolved

rochacbruno reviewed Oct 19, 2023

View reviewed changes

galaxy_ng/tests/unit/app/management/commands/analytics/automation_analytics/test_data.py Outdated Show resolved Hide resolved

slemrmartin force-pushed the fix-metrics-collection-api-call branch 4 times, most recently from 616f56c to 84a42a6 Compare October 23, 2023 11:13

Metrics Collection: CI test

0308100

Jira AA-1892 No-Issue Signed-off-by: Martin Slemr <[email protected]>

slemrmartin force-pushed the fix-metrics-collection-api-call branch from 84a42a6 to 0308100 Compare October 23, 2023 12:01

rochacbruno merged commit a479d54 into ansible:master Oct 23, 2023
20 checks passed

slemrmartin deleted the fix-metrics-collection-api-call branch October 30, 2023 10:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Metrics Collection: Added GALAXY_API_PATH_PREFIX to API call #1939

Metrics Collection: Added GALAXY_API_PATH_PREFIX to API call #1939

slemrmartin commented Oct 17, 2023

slemrmartin commented Oct 23, 2023 •

edited

Loading

rochacbruno commented Oct 23, 2023

patchback bot commented Oct 23, 2023 •

edited

Loading

patchback bot commented Oct 23, 2023 •

edited

Loading

patchback bot commented Oct 23, 2023 •

edited

Loading

patchback bot commented Oct 23, 2023 •

edited

Loading

patchback bot commented Oct 23, 2023 •

edited

Loading

patchback bot commented Oct 23, 2023 •

edited

Loading

Metrics Collection: Added GALAXY_API_PATH_PREFIX to API call #1939

Metrics Collection: Added GALAXY_API_PATH_PREFIX to API call #1939

Conversation

slemrmartin commented Oct 17, 2023

What is this PR doing:

Reviewers must know:

slemrmartin commented Oct 23, 2023 • edited Loading

rochacbruno commented Oct 23, 2023

patchback bot commented Oct 23, 2023 • edited Loading

Backport to stable-4.2: 💔 cherry-picking failed — conflicts found

Backporting merged PR #1939 into master

patchback bot commented Oct 23, 2023 • edited Loading

Backport to stable-4.4: 💔 cherry-picking failed — conflicts found

Backporting merged PR #1939 into master

patchback bot commented Oct 23, 2023 • edited Loading

Backport to stable-4.5: 💔 cherry-picking failed — conflicts found

Backporting merged PR #1939 into master

patchback bot commented Oct 23, 2023 • edited Loading

Backport to stable-4.6: 💔 cherry-picking failed — conflicts found

Backporting merged PR #1939 into master

patchback bot commented Oct 23, 2023 • edited Loading

Backport to stable-4.7: 💔 cherry-picking failed — conflicts found

Backporting merged PR #1939 into master

patchback bot commented Oct 23, 2023 • edited Loading

Backport to stable-4.8: 💔 cherry-picking failed — conflicts found

Backporting merged PR #1939 into master

slemrmartin commented Oct 23, 2023 •

edited

Loading

patchback bot commented Oct 23, 2023 •

edited

Loading

patchback bot commented Oct 23, 2023 •

edited

Loading

patchback bot commented Oct 23, 2023 •

edited

Loading

patchback bot commented Oct 23, 2023 •

edited

Loading

patchback bot commented Oct 23, 2023 •

edited

Loading

patchback bot commented Oct 23, 2023 •

edited

Loading