default to use pulp stable repos for all except nightly

tstrych · Nov 5, 2018 · e173b1c · e173b1c
1 parent 6e3a7e4
commit e173b1c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 2 deletions.
diff --git a/pipelines/pipeline_katello_upgrade_38.yml b/pipelines/pipeline_katello_upgrade_38.yml
@@ -14,6 +14,7 @@
     puppet_repositories_version: 4
     katello_repositories_version: 3.6
     katello_repositories_pulp_version: 2.15
+    katello_repositories_pulp_release: stable
     foreman_repositories_version: 1.17
     foreman_installer_scenario: katello
     foreman_installer_options_internal_use_only:
@@ -43,6 +44,7 @@
     puppet_repositories_version: 5
     katello_repositories_version: 3.7
     katello_repositories_pulp_version: 2.16
+    katello_repositories_pulp_release: stable
     foreman_repositories_version: 1.18
     foreman_installer_upgrade: True
     foreman_repositories_environment: release
@@ -65,6 +67,7 @@
     foreman_installer_upgrade: True
     katello_repositories_environment: staging
     foreman_repositories_environment: staging
+    katello_repositories_pulp_release: stable
     foreman_installer_scenario: katello
     foreman_installer_options_internal_use_only:
       - "--disable-system-checks"

diff --git a/pipelines/pipeline_katello_upgrade_39.yml b/pipelines/pipeline_katello_upgrade_39.yml
@@ -13,6 +13,7 @@
   vars:
     puppet_repositories_version: 4
     katello_repositories_version: 3.7
+    katello_repositories_pulp_release: stable
     katello_repositories_pulp_version: 2.16
     foreman_repositories_version: 1.18
     foreman_installer_scenario: katello
@@ -43,6 +44,7 @@
     puppet_repositories_version: 5
     katello_repositories_version: 3.8
     katello_repositories_pulp_version: 2.16
+    katello_repositories_pulp_release: stable
     foreman_repositories_version: 1.19
     foreman_installer_upgrade: True
     foreman_repositories_environment: release
@@ -67,6 +69,7 @@
     katello_repositories_environment: staging
     foreman_repositories_environment: staging
     foreman_client_repositories_environment: staging
+    katello_repositories_pulp_release: stable
     foreman_installer_scenario: katello
     foreman_installer_options_internal_use_only:
       - "--disable-system-checks"

diff --git a/pipelines/pipeline_katello_upgrade_nightly.yml b/pipelines/pipeline_katello_upgrade_nightly.yml
@@ -14,6 +14,7 @@
     puppet_repositories_version: 5
     katello_repositories_version: 3.8
     katello_repositories_pulp_version: 2.16
+    katello_repositories_pulp_release: stable
     foreman_repositories_version: 1.19
     foreman_installer_scenario: katello
     foreman_installer_options_internal_use_only:
@@ -43,6 +44,7 @@
     puppet_repositories_version: 5
     katello_repositories_version: 3.9
     katello_repositories_pulp_version: 2.17
+    katello_repositories_pulp_release: stable
     foreman_repositories_version: '1.20'
     foreman_installer_upgrade: True
     foreman_repositories_environment: release
@@ -61,6 +63,7 @@
   vars:
     katello_repositories_version: nightly
     katello_repositories_pulp_version: nightly
+    katello_repositories_pulp_release: beta
     foreman_repositories_version: nightly
     foreman_installer_upgrade: True
     katello_repositories_environment: staging

diff --git a/roles/katello_repositories/defaults/main.yml b/roles/katello_repositories/defaults/main.yml
@@ -2,4 +2,4 @@
 katello_repositories_version: nightly
 katello_repositories_environment: release
 katello_repositories_pulp_version: nightly
-katello_repositories_pulp_release: beta
+katello_repositories_pulp_release: stable
diff --git a/roles/pulp_repositories/defaults/main.yml b/roles/pulp_repositories/defaults/main.yml
@@ -1,3 +1,3 @@
 ---
 pulp_repositories_version: 'nightly'
-pulp_repositories_release: 'beta'
+pulp_repositories_release: 'stable'