Update existing steps to adjust ocp 4.0

Author: xiuwang

features/step_definitions/images/jenkins.rb

@@ -103,11 +103,16 @@
 #   non-SSO login.
 # Installation step also installs based on this.
 Given /^I log in to jenkins$/ do
-  if env.version_ge("3.4", user: user) && user.password?
+  if env.version_ge("3.4", user: user) && env.version_le("3.11", user: user) && user.password?
     step %Q/I perform the :jenkins_oauth_login web action with:/, table(%{
       | username | <%= user.name %>     |
       | password | <%= user.password %> |
       })
+  elsif env.version_gt("3.11", user: user) && 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    |
@@ -118,10 +123,12 @@
 end
 
 Given /^I update #{QUOTED} slave image for jenkins #{NUMBER} server$/ do |slave_name,jenkins_version|
-  le39 = env.version_le("3.9", user: user)
 
   step 'I store master major version in the clipboard'
-  if le39 or jenkins_version == '1'
+
+  if env.version_gt("3.11", user: user)
+    print "Skipped, agent images don't need update above openshift 4.0"
+  elsif env.version_le("3.9", user: user) or jenkins_version == '1'
     step %Q/I perform the :jenkins_update_cloud_image web action with:/, table(%{
       | currentimgval | registry.access.redhat.com/openshift3/jenkins-slave-#{slave_name}-rhel7                          |
       | cloudimage    | <%= product_docker_repo %>openshift3/jenkins-slave-#{slave_name}-rhel7:v<%= cb.master_version %> |
@@ -131,7 +138,7 @@
       | currentimgval | openshift3/jenkins-agent-maven-35-rhel7                                                     |
       | cloudimage    | <%= product_docker_repo %>openshift3/jenkins-agent-maven-35-rhel7:v<%= cb.master_version %> |
       })
-  elsif slave_name == 'nodejs'
+  else slave_name == 'nodejs'
     step %Q/I perform the :jenkins_update_cloud_image web action with:/, table(%{
       | currentimgval | openshift3/jenkins-agent-nodejs-8-rhel7                                                     |
       | cloudimage    | <%= product_docker_repo %>openshift3/jenkins-agent-nodejs-8-rhel7:v<%= cb.master_version %> |
@@ -140,63 +147,3 @@
 
   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/environment.rb

@@ -240,10 +240,11 @@ def get_version(user:)
       if obtained[:request_opts][:url].include?("/version/openshift") &&
           !obtained[:success]
         # seems like pre-3.3 version, lets hardcode to 3.2
+        # After bug 1692670 fix, will recover hardcode to '3.2'.
         obtained[:props] = {}
-        obtained[:props][:openshift] = "v3.2"
-        @major_version = obtained[:props][:major] = 3
-        @minor_version = obtained[:props][:minor] = 2
+        obtained[:props][:openshift] = "v4.0"
+        @major_version = obtained[:props][:major] = 4
+        @minor_version = obtained[:props][:minor] = 0
       elsif obtained[:success]
         @major_version = obtained[:props][:major].to_i
         @minor_version = obtained[:props][:minor].to_i

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

@@ -603,14 +603,8 @@ jenkins_multi_oauth_login:
         Logtext.click();
         return true;
     expect_result: true
-  - command: |
-        var Authtype = document.getElementsByClassName("idp")[1]
-        if (typeof(Authtype) == "undefined"){ 
-           return true;
-           }
-        Authtype.click();
-        return true;
-    expect_result: true
+  - command: return document.getElementsByClassName("idp")[1].click()
+    expect_result: ~
   elements:
   - selector:
       id: inputUsername