Browse code

Merge "Skip EPEL & RDO install for CI nodes"

Jenkins authored on 2016/05/20 20:59:09
Showing 1 changed files
... ...
@@ -335,6 +335,13 @@ fi
335 335
 # to speed things up
336 336
 SKIP_EPEL_INSTALL=$(trueorfalse False SKIP_EPEL_INSTALL)
337 337
 
338
+# If we have /etc/nodepool/provider assume we're on a OpenStack CI
339
+# node, where EPEL is already pointing at our internal mirror and RDO
340
+# is pre-installed.
341
+if [[ -f /etc/nodepool/provider ]]; then
342
+    SKIP_EPEL_INSTALL=True
343
+fi
344
+
338 345
 if is_fedora && [[ $DISTRO == "rhel7" ]] && \
339 346
         [[ ${SKIP_EPEL_INSTALL} != True ]]; then
340 347
     _install_epel_and_rdo