Changes for 6.16.z new branch

omkarkhatavkar · Apr 3, 2024 · 024eeb2 · 024eeb2
1 parent 9c6a2be
commit 024eeb2
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 360 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
@@ -29,6 +29,6 @@ wait-for==1.2.0
 wrapanapi==3.6.0
 
 # Get airgun, nailgun and upgrade from master
-airgun @ git+https://github.com/SatelliteQE/airgun.git@master#egg=airgun
-nailgun @ git+https://github.com/SatelliteQE/nailgun.git@master#egg=nailgun
+airgun @ git+https://github.com/SatelliteQE/airgun.git@6.16.z#egg=airgun
+nailgun @ git+https://github.com/SatelliteQE/nailgun.git@6.16.z#egg=nailgun
 --editable .
diff --git a/robottelo/constants/__init__.py b/robottelo/constants/__init__.py
@@ -18,7 +18,7 @@ class Colored(Box):
 # This should be updated after each version branch
 SATELLITE_VERSION = "6.16"
 SATELLITE_OS_VERSION = "8"
-SAT_NON_GA_VERSIONS = ['6.15', '6.16']
+SAT_NON_GA_VERSIONS = ['6.16']
 
 # Default system ports
 HTTPS_PORT = '443'
@@ -171,7 +171,7 @@ class Colored(Box):
 AZURERM_VM_SIZE_DEFAULT = 'Standard_B1s'
 AZURERM_PREMIUM_OS_Disk = True
 AZURERM_FILE_URI = (
-    'https://raw.githubusercontent.com/SatelliteQE/robottelo/master/tests/foreman/data/uri.sh'
+    'https://raw.githubusercontent.com/SatelliteQE/robottelo/6.16.z/tests/foreman/data/uri.sh'
 )
 
 OPERATING_SYSTEMS = entities._OPERATING_SYSTEMS