Merge ~jneo8/charm-prometheus-blackbox-exporter:build/juju-3.1 into charm-prometheus-blackbox-exporter:master

Proposed by JamesLin
Status: Merged
Approved by: Eric Chen
Approved revision: 5181b631215cd3650fc63e50293c289249f832c5
Merged at revision: 33d3cf8f39d26621ed56f587d107ab2cd2f9d130
Proposed branch: ~jneo8/charm-prometheus-blackbox-exporter:build/juju-3.1
Merge into: charm-prometheus-blackbox-exporter:master
Diff against target: 10 lines (+2/-2)
1 file modified
src/tests/functional/requirements.txt (+2/-2)
Reviewer Review Type Date Requested Status
🤖 prod-jenkaas-bootstack (community) continuous-integration Approve
Tianqi Xiao (community) Approve
Eric Chen Approve
BootStack Reviewers Pending
Review via email: mp+452922@code.launchpad.net

Commit message

build(juju-3.1): Change zaza dependency to branch libjuju-3.1

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Eric Chen (eric-chen) wrote :

wait for juju3.1 jenkins result

review: Approve
Revision history for this message
Tianqi Xiao (txiao) wrote :

Code change LGTM. Also waiting for +1 from CI

review: Approve
Revision history for this message
Tianqi Xiao (txiao) wrote :

Blocking the MP until commit author is properly updated.

review: Needs Fixing
Revision history for this message
Tianqi Xiao (txiao) :
review: Approve
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Tianqi Xiao (txiao) wrote :

Re-triggering CI since the previous failure was caused by last week's Launchpad Git outage

Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
JamesLin (jneo8) wrote :

Re-build CI

Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Approve (continuous-integration)
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 33d3cf8f39d26621ed56f587d107ab2cd2f9d130

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/tests/functional/requirements.txt b/src/tests/functional/requirements.txt
2index 48e28b2..370bd24 100644
3--- a/src/tests/functional/requirements.txt
4+++ b/src/tests/functional/requirements.txt
5@@ -1,2 +1,2 @@
6-git+https://github.com/openstack-charmers/zaza.git#egg=zaza
7-python-openstackclient
8\ No newline at end of file
9+git+https://github.com/openstack-charmers/zaza.git@libjuju-3.1#egg=zaza
10+python-openstackclient

Subscribers

People subscribed via source and target branches

to all changes: