Modify jenkins steps to adjust 4.0 change

Author: xiuwang

features/step_definitions/images/jenkins.rb

@@ -61,13 +61,14 @@
   cb.jenkins_major_version = version
 
   # wait for actual startup as in 3.10+ it is slow on only 512M pod
-  timeout = 300
   if version == "1"
+    timeout = 300
     wait_string = "Jenkins is fully up and running"
   else
     # seems like recent jenkins has a delay caused by admin monitor
     # here trying to wait for it's operation to finish
     # possible remedy is DISABLE_ADMINISTRATIVE_MONITOR or give mor RAM to pod
+    timeout = 600
     wait_string = "Finished Download metadata."
   end
   started = wait_for(timeout) {
@@ -139,3 +140,63 @@
 
   step 'the step should succeed'
 end
+
+Given /^I have a jenkins server with above 40 cluster$/ do
+
+  last_startup_check = monotonic_seconds
+  if !user.password?
+    step %Q/I run the :new_app client command with:/, table(%{
+      | p        | ENABLE_OAUTH=false |
+      | template | jenkins-persistent |
+      })
+    step 'the step should succeed'
+  else
+    step %Q/I run the :new_app client command with:/, table(%{
+      | template | jenkins-persistent |
+      })
+    step 'the step should succeed'
+  end
+
+  step 'I wait for the "jenkins" service to become ready up to 600 seconds'
+  cb.jenkins_svc = service
+  cache_resources *service.pods, route("jenkins", service("jenkins"))
+  cb.jenkins_pod = pod
+  cb.jenkins_route = route
+  cb.jenkins_dns = cb.jenkins_route.dns
+  cb.jenkins_major_version = 2
+
+  timeout = 600
+  wait_string = "Finished Download metadata."
+
+  started = wait_for(timeout) {
+    since = monotonic_seconds - last_startup_check
+    res = user.cli_exec(
+      :logs,
+      resource_name: cb.jenkins_pod.name,
+      since: "#{since.to_i + 5}s",
+      _quiet: true
+    )
+    last_startup_check += since
+    res[:response].include? wait_string
+  }
+  if started
+    logger.info "Jenkins log line found: #{wait_string}"
+  else
+    raise "Jenkins failed to start within #{timeout} seconds"
+  end
+end
+
+Given /^I log into jenkins with above 40 cluster$/ do
+  if user.password?
+    step %Q/I perform the :jenkins_multi_oauth_login web action with:/, table(%{
+      | username | <%= user.name %>     |
+      | password | <%= user.password %> |
+      })
+  else
+    step %Q/I perform the :jenkins_standard_login web action with:/, table(%{
+      | username | admin    |
+      | password | password |
+      })
+  end
+  step 'the step should succeed'
+end

lib/rules/web/images/jenkins_2/jenkins_2.xyaml

@@ -552,16 +552,52 @@ jenkins_standard_login:
       name: j_password
     op: send_keys <password>
     type: input
+  scripts:
+  - command: return document.getElementsByName("Submit")[0].click()
+    expect_result: ~
+  action: jenkins_verify_logged_in
+
+jenkins_oauth_login:
+  url: /securityRealm/commenceLogin?from=%2F
+  scripts:
+  - command: |
+        var Logtext = document.getElementsByClassName("btn btn-lg btn-primary")[0]
+        if (typeof(Logtext) == "undefined"){ 
+           return true;
+           }
+        Logtext.click();
+        return true;
+    expect_result: true
   elements:
   - selector:
-      id: yui-gen1-button
+      id: inputUsername
+    op: send_keys <username>
+    type: input
+  - selector:
+      id: inputPassword
+    op: send_keys <password>
+    type: input
+  - selector:
+      text: Log In
     op: click
     type: button
+  scripts:
+  - command: |
+        var Auth = document.getElementsByName("approve")[0]
+        if (typeof(Auth) == "undefined"){ 
+           return true;
+           }
+        Auth.click();
+        return true;
+    expect_result: true
   action: jenkins_verify_logged_in
 
-jenkins_oauth_login:
+jenkins_multi_oauth_login:
   url: /securityRealm/commenceLogin?from=%2F
   scripts:
+  - command: return document.getElementsByClassName("idp")[1].click()
+    expect_result: ~
+  scripts:
   - command: |
         var Logtext = document.getElementsByClassName("btn btn-lg btn-primary")[0]
         if (typeof(Logtext) == "undefined"){