Merge branch 'main' into grafana_host_parameterization

alteryx · Jan 11, 2024 · 8623eac · 8623eac
2 parents 257c33c + b4d3b6a
commit 8623eac
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 4 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.3.11
+current_version = 1.3.12
 commit = True
 tag = True
 message = "[ci skip] Bumping version {current_version} to {new_version}"

diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "locust-grasshopper"
-version = "1.3.11" # Managed by bump2version
+version = "1.3.12" # Managed by bump2version
 readme = {file = "README.md", content-type = "text/markdown"}
 description = "a load testing tool extended from locust"
 classifiers = [

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,7 +1,7 @@
 assertpy==1.0
-black==22.1.0
+black==22.3.0
 bump2version==1.0.1
-click==8.0.4
+click==8.1.3
 coverage==6.3.2
 flake8==6.0.0
 flake8-import-order==0.18.2

diff --git a/src/grasshopper/lib/configuration/gh_configuration.py b/src/grasshopper/lib/configuration/gh_configuration.py
@@ -123,6 +123,15 @@ class ConfigurationConstants:
         },
         "rp_token": {
             "opts": ["--rp_token"],
+            "attrs": {
+                "action": "store",
+                "help": "LEGACY FOR RP_UUID: API token for accessing report portal "
+                "server. NYI. "
+                "programmatically.",
+            },
+        },
+        "rp_uuid": {
+            "opts": ["--rp_uuid"],
             "attrs": {
                 "action": "store",
                 "help": "API token for accessing report portal server. NYI. "
@@ -270,6 +279,15 @@ class ConfigurationConstants:
             "typecast": typecast_bool,
             "default": False,
         },
+        "rp_launch": {
+            "opts": ["--rp_launch"],
+            "attrs": {
+                "action": "store",
+                "help": "LEGACY FOR RP_LAUNCH: Base launch name to use when posting to "
+                "report portal. NYI",
+            },
+            "default": "Grasshopper Performance Test Run | Launch name unknown",
+        },
         "rp_launch_name": {
             "opts": ["--rp_launch_name"],
             "attrs": {

diff --git a/src/grasshopper/lib/fixtures/grasshopper_constants.py b/src/grasshopper/lib/fixtures/grasshopper_constants.py
@@ -24,6 +24,8 @@ class GrasshopperConstants:
         "slack_report_failures_only",
         "cleanup_s3",
         "rp_token",
+        "rp_uuid",
+        "rp_launch",
         "rp_launch_name",
         "rp_project",
         "rp_endpoint",

diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py
@@ -53,6 +53,7 @@ def current_global_defaults():
         "influx": False,
         "report_portal": False,
         "rp_launch_name": "Grasshopper Performance Test Run | Launch name unknown",
+        "rp_launch": "Grasshopper Performance Test Run | Launch name unknown",
     }
     return defaults
 

diff --git a/tests/unit/test_grasshopper_configuration_fixtures.py b/tests/unit/test_grasshopper_configuration_fixtures.py
@@ -27,6 +27,7 @@ def expected_global_defaults():
         "influx": False,
         "report_portal": False,
         "rp_launch_name": "Grasshopper Performance Test Run | Launch name unknown",
+        "rp_launch": "Grasshopper Performance Test Run | Launch name unknown",
     }
     return defaults