upload_assets: use options instead of env vars for endpoint URL and bucket

Author: soxofaan

.github/workflows/benchmarks.yaml

@@ -31,12 +31,12 @@ jobs:
             --html report/report.html --self-contained-html \
             --track-metrics-report=report/metrics.json \
             --basetemp=tmp-results \
-            --upload-assets-runid="gh-$GITHUB_RUN_ID"
+            --upload-assets-run-id="gh-$GITHUB_RUN_ID" \
+            --upload-assets-endpoint-url="https://s3.waw3-1.cloudferro.com" \
+            --upload-assets-bucket="APEx-benchmarks"
         env:
           OPENEO_AUTH_METHOD: client_credentials
           OPENEO_AUTH_CLIENT_CREDENTIALS_CDSEFED: ${{ secrets.OPENEO_AUTH_CLIENT_CREDENTIALS_CDSEFED }}
-          UPLOAD_ASSETS_ENDPOINT_URL: "https://s3.waw3-1.cloudferro.com"
-          UPLOAD_ASSETS_BUCKET: "APEx-benchmarks"
           UPLOAD_ASSETS_ACCESS_KEY_ID: ${{ secrets.UPLOAD_ASSETS_ACCESS_KEY_ID }}
           UPLOAD_ASSETS_SECRET_ACCESS_KEY: ${{ secrets.UPLOAD_ASSETS_SECRET_ACCESS_KEY }}
       - name: List local reports

qa/tools/apex_algorithm_qa_tools/pytest_upload_assets.py

@@ -19,36 +19,45 @@
 
 
 def pytest_addoption(parser):
-    # TODO: options for S3 bucket, credentials, ...
     # TODO: option to always upload (also on success).
     parser.addoption(
-        "--upload-assets-runid",
+        "--upload-assets-run-id",
         metavar="ID",
         action="store",
         help="The run ID to use for building the S3 key.",
     )
+    parser.addoption(
+        "--upload-assets-endpoint-url",
+        metavar="URL",
+        action="store",
+        help="The S3 endpoint URL to upload to.",
+    )
+    parser.addoption(
+        "--upload-assets-bucket",
+        metavar="BUCKET",
+        action="store",
+        help="The S3 bucket to upload to.",
+    )
 
 
 def pytest_configure(config: pytest.Config):
+    run_id = config.getoption("upload_assets_run_id")
+    endpoint_url = config.getoption("upload_assets_endpoint_url")
+    bucket = config.getoption("upload_assets_bucket")
     if (
-        # TODO only register if enough config is available for setup
+        endpoint_url
+        and bucket
         # Don't register on xdist worker nodes
-        not hasattr(config, "workerinput")
+        and not hasattr(config, "workerinput")
     ):
         s3_client = boto3.client(
             service_name="s3",
             aws_access_key_id=os.environ.get("UPLOAD_ASSETS_ACCESS_KEY_ID"),
             aws_secret_access_key=os.environ.get("UPLOAD_ASSETS_SECRET_ACCESS_KEY"),
-            # TODO Option for endpoint url
-            endpoint_url=os.environ.get("UPLOAD_ASSETS_ENDPOINT_URL"),
+            endpoint_url=endpoint_url,
         )
-        bucket = os.environ.get("UPLOAD_ASSETS_BUCKET")
         config.pluginmanager.register(
-            S3UploadPlugin(
-                run_id=config.getoption("upload_assets_runid"),
-                s3_client=s3_client,
-                bucket=bucket,
-            ),
+            S3UploadPlugin(run_id=run_id, s3_client=s3_client, bucket=bucket),
             name=_PLUGIN_NAME,
         )