Changes for 6.16.z new branch

omkarkhatavkar · Mar 12, 2024 · 65ac176 · 65ac176
1 parent 12d57f0
commit 65ac176
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 175 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -10,6 +10,7 @@ updates:
     schedule:
       interval: "daily"
     labels:
+      - '6.16.z'
       - "CherryPick"
       - "dependencies"
       - "6.15.z"
@@ -23,6 +24,7 @@ updates:
     schedule:
       interval: "daily"
     labels:
+      - '6.16.z'
       - "CherryPick"
       - "dependencies"
       - "6.15.z"

diff --git a/.github/workflows/auto_branching.yml b/.github/workflows/auto_branching.yml
diff --git a/.github/workflows/dispatch_release.yml b/.github/workflows/dispatch_release.yml
diff --git a/requirements.txt b/requirements.txt
@@ -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

diff --git a/setup.py b/setup.py
@@ -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',

diff --git a/tests/foreman/cli/test_capsulecontent.py b/tests/foreman/cli/test_capsulecontent.py
@@ -43,7 +43,6 @@
     ],
     indirect=True,
 )
-@pytest.mark.stream
 def test_positive_content_counts_for_mixed_cv(
     target_sat,
     module_capsule_configured,
@@ -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