Merge pull request #1556 from atlassian/bamboo/upd-agent-resources

upd-agent-resources
atlassian · Sep 11, 2024 · f47ce08 · f47ce08
2 parents 5a066c8 + 6be9c47
commit f47ce08
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/app/jmeter/bamboo.jmx b/app/jmeter/bamboo.jmx
@@ -173,13 +173,13 @@
           </collectionProp>
         </Arguments>
         <hashTree/>
-        <TransactionController guiclass="TransactionControllerGui" testclass="TransactionController" testname="jmeter_login_and_view_all_builds" enabled="true">
+        <TransactionController guiclass="TransactionControllerGui" testclass="TransactionController" testname="jmeter_login_and_view_all_builds">
           <boolProp name="TransactionController.parent">true</boolProp>
           <boolProp name="TransactionController.includeTimers">false</boolProp>
         </TransactionController>
         <hashTree>
-          <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="95 /userlogin!doDefault.action" enabled="true">
-            <stringProp name="HTTPSampler.path">${application.postfix}/userlogin!doDefault.action</stringProp>
+          <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="95 /userlogin!doDefault.action">
+            <stringProp name="HTTPSampler.path">${application.postfix}/userlogin.action</stringProp>
             <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
             <stringProp name="HTTPSampler.method">GET</stringProp>
             <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
@@ -229,7 +229,7 @@
             </ResponseAssertion>
             <hashTree/>
           </hashTree>
-          <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="100 /userlogin.action" enabled="true">
+          <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="100 /userlogin.action">
             <stringProp name="TestPlan.comments">User login action</stringProp>
             <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp>
             <stringProp name="HTTPSampler.path">${application.postfix}/userlogin.action</stringProp>
@@ -318,7 +318,7 @@
             <hashTree/>
           </hashTree>
         </hashTree>
-        <IfController guiclass="IfControllerPanel" testclass="IfController" testname="login checker" enabled="true">
+        <IfController guiclass="IfControllerPanel" testclass="IfController" testname="login checker">
           <stringProp name="IfController.condition">${__jexl3(!${JMeterThread.last_sample_ok},)}</stringProp>
           <boolProp name="IfController.evaluateAll">false</boolProp>
           <boolProp name="IfController.useExpression">true</boolProp>

diff --git a/app/selenium_ui/bamboo/pages/selectors.py b/app/selenium_ui/bamboo/pages/selectors.py
@@ -6,7 +6,7 @@ class UrlManager:
 
     def __init__(self, build_plan_id=None):
         self.host = BAMBOO_SETTINGS.server_url
-        self.login_params = '/userlogin!doDefault.action'
+        self.login_params = '/userlogin.action'
         self.logout_params = '/userLogout.action'
         self.all_projects_params = '/allProjects.action'
         self.plan_summary_params = f'/browse/{build_plan_id}'

diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars
@@ -443,7 +443,7 @@ bamboo_min_heap = "2048m"
 bamboo_max_heap = "4096m"
 
 # Bamboo Agent instance resource configuration
-bamboo_agent_cpu = "250m"
+bamboo_agent_cpu = "300m"
 bamboo_agent_mem = "700m"
 
 # Storage