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.

Sign up for GitHub

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

Changes for 6.16.z new branch #229

Closed
wants to merge 1 commit into from
Closed

Changes for 6.16.z new branch #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ updates:
schedule:
interval: "daily"
labels:
- '6.16.z'
- "CherryPick"
- "dependencies"
- "6.15.z"
Expand All @@ -23,6 +24,7 @@ updates:
schedule:
interval: "daily"
labels:
- '6.16.z'
- "CherryPick"
- "dependencies"
- "6.15.z"
Expand Down
139 changes: 0 additions & 139 deletions .github/workflows/auto_branching.yml
View file
Open in desktop

This file was deleted.

31 changes: 0 additions & 31 deletions .github/workflows/dispatch_release.yml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ wait-for==1.2.0
wrapanapi==3.6.0

# Get airgun, nailgun and upgrade from master
git+https://github.com/SatelliteQE/airgun.git@master#egg=airgun
git+https://github.com/SatelliteQE/nailgun.git@master#egg=nailgun
git+https://github.com/SatelliteQE/airgun.git@6.16.z#egg=airgun
git+https://github.com/SatelliteQE/nailgun.git@6.16.z#egg=nailgun
# Broker currently is unable to push to PyPi due to [1] and [2]
# In the meantime, we install directly from the repo
# [1] - https://github.com/ParallelSSH/ssh2-python/issues/193
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

setup(
name='robottelo',
version='0.1.0',
version='6.16.z',
description='Robottelo is a test suite which exercises The Foreman.',
long_description=README,
author='Satellite QE Team',
Expand Down
2 changes: 0 additions & 2 deletions tests/foreman/cli/test_capsulecontent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
],
indirect=True,
)
@pytest.mark.stream
def test_positive_content_counts_for_mixed_cv(
target_sat,
module_capsule_configured,
Expand Down Expand Up @@ -179,7 +178,6 @@ def test_positive_content_counts_for_mixed_cv(
assert len(info['lifecycle-environments']) == 0, 'The LCE is still listed'


@pytest.mark.stream
def test_positive_update_counts(target_sat, module_capsule_configured):
"""Verify the update counts functionality
Expand Down