snap-store-proxy-charm

Merge ~drednout/snap-store-proxy-charm:jenkins-health-check into snap-store-proxy-charm:main

  1. Git
  2. lp:~drednout/snap-store-proxy-charm
  3. jenkins-health-check
  4. Merge into main
Proposed by Alex Ramanau
Status: Rejected
Rejected by: Alex Ramanau
Proposed branch: ~drednout/snap-store-proxy-charm:jenkins-health-check
Merge into: snap-store-proxy-charm:main
Diff against target: 25 lines (+3/-2)
2 files modified
README.md (+1/-0)
requirements-dev.txt (+2/-2)
Reviewer Review Type Date Requested Status
Odysseus Kaziolas Needs Information
Review via email: mp+466219@code.launchpad.net

Commit message

Added empty line for pipeline test

Description of the change

Added empty line for pipeline test

To post a comment you must log in.
Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :

Beginning pre-merge CI tests for revision e9d9a24872e49de9d4361b2dd2d2bd9ce725ab3e

Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :

Pre-merge CI tests failed for revision e9d9a24872e49de9d4361b2dd2d2bd9ce725ab3e
Running landing tests failed.
https://jenkins.ols.ps5.canonical.com/job/snap-store-proxy-charm-pre-merge-tests/2/

~drednout/snap-store-proxy-charm:jenkins-health-check updated
9f094ec... by Alex Ramanau

Pin pytest-xdist deps for fixing tests

Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :

Beginning pre-merge CI tests for revision 9f094ec4dc2c67602ea975df7982b8cd2c71f198

Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :

Pre-merge CI tests passed successfully for revision 9f094ec4dc2c67602ea975df7982b8cd2c71f198

Revision history for this message
Odysseus Kaziolas (odysseus-k) :
review: Needs Information

Unmerged commits

9f094ec... by Alex Ramanau

Pin pytest-xdist deps for fixing tests

e9d9a24... by Alex Ramanau

Added empty line for pipeline test

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/README.md b/README.md
2index dbb1e49..1d00098 100644
3--- a/README.md
4+++ b/README.md
5@@ -90,3 +90,4 @@ As the markup used on discourse is commonmark, the lint make target has been ada
6 Bugs can be reported on: https://bugs.launchpad.net/snap-store-proxy-charm
7 The source code can be found on: https://code.launchpad.net/snap-store-proxy-charm
8 For hints and tips on working with the sourcecode, please check the documention via: https://charmhub.io/snap-store-proxy/docs
9+
10diff --git a/requirements-dev.txt b/requirements-dev.txt
11index cdd103c..528eab3 100644
12--- a/requirements-dev.txt
13+++ b/requirements-dev.txt
14@@ -8,8 +8,8 @@ flake8-black
15 pytest<7 # Needed due to pytest-pythonpath
16 pytest-pythonpath
17 pytest-mock
18-pytest-xdist
19+pytest-xdist==2.5.0
20 pytest-sugar
21 pytest-cov
22 pytest-isort
23-pymarkdownlnt
24\ No newline at end of file
25+pymarkdownlnt

Subscribers

People subscribed via source and target branches