Skip to content

Comments

MON-3528: [bot] Bump openshift/prometheus to v2.48.0#186

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:masterfrom
rhobs:automated-updates-master
Nov 28, 2023
Merged

MON-3528: [bot] Bump openshift/prometheus to v2.48.0#186
openshift-merge-bot[bot] merged 1 commit intoopenshift:masterfrom
rhobs:automated-updates-master

Conversation

@openshift-monitoring-bot
Copy link

Description

This is an automated version bump from CI.
If you wish to perform this manually, execute the following commands from openshift/prometheus repo,

git fetch https://github.com/prometheus/prometheus --tags
if ! git merge refs/tags/v2.48.0 --no-edit; then
  git checkout --theirs CHANGELOG.md VERSION go.mod go.sum .golangci.yml
  git checkout --ours 
  git add CHANGELOG.md VERSION go.mod go.sum .golangci.yml 
  git merge --continue
fi
go mod tidy
go mod vendor
# Only compress assets if assets actually changed
# The git diff relies on gits remote naming. The merge-flow checks out
# $downstream as origin at the time of writing this code.
if ! git diff --exit-code origin/master web/ui; then
  make assets-compress
  find web/ui/static -type f -name '*.gz' -exec git add {} \;
  git add web/ui/embed.go
  git diff --cached --exit-code || git commit -s -m "[bot] assets: generate"
fi

if [ -f scripts/rh-manifest.sh ]; then
  bash scripts/rh-manifest.sh
  git add rh-manifest.txt
  git diff --cached --exit-code || git commit -s -m "[bot] update rh-manifest.txt"
fi

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@openshift-ci openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Nov 25, 2023
@openshift-ci
Copy link

openshift-ci bot commented Nov 25, 2023

Hi @openshift-monitoring-bot[bot]. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@raptorsun
Copy link

/retest

@raptorsun
Copy link

/ok-to-test
/lgtm

@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 28, 2023
@machine424
Copy link

The heavy lifting was done in #185
/lgtm

@openshift-ci
Copy link

openshift-ci bot commented Nov 28, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: machine424, openshift-monitoring-bot[bot], raptorsun

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [machine424,raptorsun]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci
Copy link

openshift-ci bot commented Nov 28, 2023

@openshift-monitoring-bot[bot]: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@simonpasquier
Copy link

/label jira/valid-reference

@simonpasquier
Copy link

simonpasquier commented Nov 28, 2023

/retitle MON-3528: [bot] Bump openshift/prometheus to v2.48.0

@openshift-ci openshift-ci bot changed the title [bot] Bump openshift/prometheus to v2.48.0 MON-3528: [bot] Bump openshift/prometheus to v2.48.0 Nov 28, 2023
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 28, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 28, 2023

@openshift-monitoring-bot[bot]: This pull request references MON-3528 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.15.0" version, but no target version was set.

Details

In response to this:

Description

This is an automated version bump from CI.
If you wish to perform this manually, execute the following commands from openshift/prometheus repo,

git fetch https://github.com/prometheus/prometheus --tags
if ! git merge refs/tags/v2.48.0 --no-edit; then
 git checkout --theirs CHANGELOG.md VERSION go.mod go.sum .golangci.yml
 git checkout --ours 
 git add CHANGELOG.md VERSION go.mod go.sum .golangci.yml 
 git merge --continue
fi
go mod tidy
go mod vendor
# Only compress assets if assets actually changed
# The git diff relies on gits remote naming. The merge-flow checks out
# $downstream as origin at the time of writing this code.
if ! git diff --exit-code origin/master web/ui; then
 make assets-compress
 find web/ui/static -type f -name '*.gz' -exec git add {} \;
 git add web/ui/embed.go
 git diff --cached --exit-code || git commit -s -m "[bot] assets: generate"
fi

if [ -f scripts/rh-manifest.sh ]; then
 bash scripts/rh-manifest.sh
 git add rh-manifest.txt
 git diff --cached --exit-code || git commit -s -m "[bot] update rh-manifest.txt"
fi

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-merge-bot openshift-merge-bot bot merged commit 6828e44 into openshift:master Nov 28, 2023
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

This PR has been included in build golang-github-prometheus-prometheus-container-v4.15.0-202311281631.p0.g6828e44.assembly.stream for distgit golang-github-prometheus-prometheus.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants