Merge pull request #34 from phongdly/PE-17825/Higgs_Automation

(PE-17825) Update do_higgs_install method with new installation log
puppetlabs · Oct 11, 2016 · 52921be · 52921be
2 parents 97f781b + d4d1646
commit 52921be
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/beaker-pe/install/pe_utils.rb b/lib/beaker-pe/install/pe_utils.rb
@@ -899,7 +899,11 @@ def do_higgs_install host, opts
 
           #wait for output to host['higgs_file']
           #we're all done when we find this line in the PE installation log
-          higgs_re = /Please\s+go\s+to\s+https:\/\/.*\s+in\s+your\s+browser\s+to\s+continue\s+installation/m
+          if version_is_less(options[:pe_ver] || host['pe_ver'], '2016.3')
+            higgs_re = /Please\s+go\s+to\s+https:\/\/.*\s+in\s+your\s+browser\s+to\s+continue\s+installation/m
+          else
+            higgs_re = /o\s+to\s+https:\/\/.*\s+in\s+your\s+browser\s+to\s+continue\s+installation/m
+          end
           res = Result.new(host, 'tmp cmd')
           tries = 10
           attempts = 0