Merge pull request #92 from matyasselmeci/pr/SOFTWARE-4277.el8bydefault

Do EL8 builds and promotes by default
opensciencegrid · Oct 27, 2020 · 2c3b2cd · 2c3b2cd
2 parents a7c889d + bb304b4
commit 2c3b2cd
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 23 deletions.
diff --git a/data/promoter.ini b/data/promoter.ini
@@ -16,8 +16,8 @@ extra_dvers=
 from=osg-3.5-%s-development
 to=osg-3.5-%s-contrib
 repotag=osg35
-dvers=el7
-extra_dvers=el8
+dvers=el7 el8
+extra_dvers=
 
 [route 3.3-prerelease]
 from=osg-3.3-%s-testing
@@ -37,8 +37,8 @@ extra_dvers=
 from=osg-3.5-%s-testing
 to=osg-3.5-%s-prerelease
 repotag=osg35
-dvers=el7
-extra_dvers=el8
+dvers=el7 el8
+extra_dvers=
 
 [route 3.4-rolling]
 from=osg-3.4-%s-testing
@@ -51,8 +51,8 @@ extra_dvers=
 from=osg-3.5-%s-testing
 to=osg-3.5-%s-rolling
 repotag=osg35
-dvers=el7
-extra_dvers=el8
+dvers=el7 el8
+extra_dvers=
 
 [route 3.3-testing]
 from=osg-3.3-%s-development
@@ -72,8 +72,8 @@ extra_dvers=
 from=osg-3.5-%s-development
 to=osg-3.5-%s-testing
 repotag=osg35
-dvers=el7
-extra_dvers=el8
+dvers=el7 el8
+extra_dvers=
 
 [route hcc]
 from=hcc-%s-testing
@@ -86,22 +86,22 @@ extra_dvers=el8
 from=osg-upcoming-%s-development
 to=osg-upcoming-%s-testing
 repotag=osgup
-dvers=el7
-extra_dvers=el8
+dvers=el7 el8
+extra_dvers=
 
 [route upcoming-prerelease]
 from=osg-upcoming-%s-testing
 to=osg-upcoming-%s-prerelease
 repotag=osgup
-dvers=el7
-extra_dvers=el8
+dvers=el7 el8
+extra_dvers=
 
 [route upcoming-rolling]
 from=osg-upcoming-%s-testing
 to=osg-upcoming-%s-rolling
 repotag=osgup
-dvers=el7
-extra_dvers=el8
+dvers=el7 el8
+extra_dvers=
 
 [route goc-itb]
 from=osg-3.4-%s-development
@@ -121,15 +121,15 @@ extra_dvers=
 from=osg-3.5-%s-development
 to=devops-%s-itb
 repotag=osg35
-dvers=el7
-extra_dvers=el8
+dvers=el7 el8
+extra_dvers=
 
 [route devops-production]
 from=devops-%s-itb
 to=devops-%s-production
 repotag=osg35
-dvers=el7
-extra_dvers=el8
+dvers=el7 el8
+extra_dvers=
 
 [aliases]
 contrib=3.5-contrib

diff --git a/osgbuild/constants.py b/osgbuild/constants.py
@@ -104,18 +104,18 @@
 # If the dver on the current machine can't be detected for some reason, or
 # isn't EL, use this.
 FALLBACK_DVER = 'el7'
-DEFAULT_DVERS = ['el7']
+DEFAULT_DVERS = ['el7', 'el8']
 DEFAULT_DVERS_BY_REPO = {
     '3.3': ['el6', 'el7'],
     'osg-3.3': ['el6', 'el7'],
     '3.4': ['el6', 'el7'],
     'osg-3.4': ['el6', 'el7'],
-    '3.5': ['el7'],
-    'osg-3.5': ['el7'],
+    '3.5': ['el7', 'el8'],
+    'osg-3.5': ['el7', 'el8'],
     'internal': ['el6', 'el7'],
     'condor': ['el6', 'el7'],
-    'devops': ['el7'],
-    'upcoming': ['el7'],
+    'devops': ['el7', 'el8'],
+    'upcoming': ['el7', 'el8'],
 }
 assert FALLBACK_DVER in DVERS
 for d in DEFAULT_DVERS: