Merge branch 'test-deploy-bb-93' into 2sv-bitbucket

atlassian · Nov 15, 2024 · de8475d · de8475d
2 parents 5d3cd44 + 2bc1c1b
commit de8475d
Show file tree

Hide file tree

Showing 9 changed files with 195 additions and 44 deletions.
diff --git a/app/bamboo.yml b/app/bamboo.yml
@@ -121,7 +121,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "130.0.6723.91" # Supports Chrome version 130. You can refer to https://googlechromelabs.github.io/chrome-for-testing
+      version: "131.0.6778.69" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing
 reporting:
 - data-source: sample-labels
   module: junit-xml
diff --git a/app/bitbucket.yml b/app/bitbucket.yml
@@ -87,7 +87,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "130.0.6723.91" # Supports Chrome version 130. You can refer to https://googlechromelabs.github.io/chrome-for-testing
+      version: "131.0.6778.69" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing
 reporting:
 - data-source: sample-labels
   module: junit-xml
diff --git a/app/confluence.yml b/app/confluence.yml
@@ -114,7 +114,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "130.0.6723.91" # Supports Chrome version 130. You can refer to https://googlechromelabs.github.io/chrome-for-testing
+      version: "131.0.6778.69" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing
 reporting:
 - data-source: sample-labels
   module: junit-xml

diff --git a/app/jira.yml b/app/jira.yml
@@ -115,7 +115,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "130.0.6723.91" # Supports Chrome version 130. You can refer to https://googlechromelabs.github.io/chrome-for-testing
+      version: "131.0.6778.69" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing
 reporting:
 - data-source: sample-labels
   module: junit-xml
diff --git a/app/jmeter/bitbucket.jmx b/app/jmeter/bitbucket.jmx
diff --git a/app/jsm.yml b/app/jsm.yml
@@ -167,7 +167,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "130.0.6723.91" # Supports Chrome version 130. You can refer to https://googlechromelabs.github.io/chrome-for-testing
+      version: "131.0.6778.69" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing
 reporting:
   - data-source: sample-labels
     module: junit-xml
diff --git a/app/selenium_ui/bitbucket/modules.py b/app/selenium_ui/bitbucket/modules.py
@@ -34,12 +34,11 @@ def login(webdriver, datasets):
         BITBUCKET_SETTINGS.admin_login,
         BITBUCKET_SETTINGS.admin_password)
     webdriver.app_version = version.parse(client.get_bitbucket_version())
-    login_page = LoginPage(webdriver)
     webdriver.debug_info = generate_debug_session_info(webdriver, datasets)
+    login_page = LoginPage(webdriver)
 
     @print_timing("selenium_login")
     def measure():
-
         @print_timing("selenium_login:open_login_page")
         def sub_measure():
             login_page.go_to()
@@ -48,6 +47,7 @@ def sub_measure():
                 login_page.go_to()
         sub_measure()
 
+        login_page.wait_for_page_loaded()
         login_page.set_credentials(datasets['current_session']['username'], datasets['current_session']['password'])
 
         @print_timing("selenium_login:login_get_started")

diff --git a/app/selenium_ui/bitbucket/pages/pages.py b/app/selenium_ui/bitbucket/pages/pages.py
@@ -8,6 +8,17 @@
 
 class LoginPage(BasePage):
     page_url = UrlManager().login_url()
+    page_loaded_selector = LoginPageLocators.footer_panel
+
+    def __init__(self, driver):
+        super().__init__(driver)
+        self.is_2sv_login = False
+
+    def wait_for_page_loaded(self):
+        self.wait_until_visible(LoginPageLocators.footer_panel)
+        if not self.get_elements(LoginPageLocators.submit_button):
+            self.is_2sv_login = True
+            print("INFO: 2sv login form")
 
     def __init__(self, driver):
         super().__init__(driver)

diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json
@@ -602,14 +602,14 @@
         ]
       },
       {
-        "version": "9.0.0",
+        "version": "9.3.0",
         "data": [
           {
             "type": "ebs",
             "size": "large",
             "snapshots": [
               {
-                "us-east-2": "snap-0ac664e91507f0e9d",
+                "us-east-2": "snap-0a197f5ad51ff7edb",
                 "us-east-1": "snap-0961da714ef84fa67"
               }
             ]
@@ -619,7 +619,7 @@
             "size": "large",
             "snapshots": [
               {
-                "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-9-0-0",
+                "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-9-3-0",
                 "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-9-0-0"
               }
             ]