Remove functional tests for opentelemetry instrumentation

.ci/ansible/Containerfile.j2

@@ -28,8 +28,7 @@ RUN pip3 install --upgrade pip setuptools wheel && \
 {{ " " }}-r ./{{ item.name }}/ci_requirements.txt
 {%- endif -%}
 {%- endfor %}
-{{ " " }}-c ./{{ plugins[0].name }}/.ci/assets/ci_constraints.txt \
-  pipdeptree && \
+{{ " " }}-c ./{{ plugins[0].name }}/.ci/assets/ci_constraints.txt && \
   rm -rf /root/.cache/pip
 
 {% if pulp_env is defined and pulp_env %}

.ci/assets/ci_constraints.txt

@@ -5,8 +5,3 @@ pulpcore>=3.21.30,!=3.23.*,!=3.24.*,!=3.25.*,!=3.26.*,!=3.27.*,!=3.29.*,!=3.30.*
 
 tablib!=3.6.0
 # 3.6.0: This release introduced a regression removing the "html" optional dependency.
-
-
-
-# Newer version seem to have a conflict around packaging, that pip fails to resolve in time. Remove this when this starts to impose an issue.
-pipdeptree<=3.23.1

.github/template_gitref

@@ -1 +1 @@
-2021.08.26-387-ge627e91
+2021.08.26-389-g444ab6c

.github/workflows/scripts/install.sh

@@ -120,7 +120,7 @@ if [ "$TEST" = "azure" ]; then
     command: "azurite-blob --blobHost 0.0.0.0"' vars/main.yaml
   sed -i -e '$a azure_test: true\
 pulp_scenario_settings: {"domain_enabled": true}\
-pulp_scenario_env: {"otel_bsp_max_export_batch_size": 1, "otel_bsp_max_queue_size": 1, "otel_exporter_otlp_endpoint": "http://localhost:4318", "otel_exporter_otlp_protocol": "http/protobuf", "pulp_otel_enabled": "true"}\
+pulp_scenario_env: {}\
 ' vars/main.yaml
 fi
 
@@ -166,5 +166,5 @@ if [[ "$TEST" = "azure" ]]; then
 fi
 
 echo ::group::PIP_LIST
-cmd_prefix bash -c "pip3 list && pipdeptree"
+cmd_prefix bash -c "pip3 list"
 echo ::endgroup::

.github/workflows/test.yml

@@ -155,5 +155,5 @@ jobs:
           docker logs pulp || true
           docker exec pulp ls -latr /etc/yum.repos.d/ || true
           docker exec pulp cat /etc/yum.repos.d/* || true
-          docker exec pulp bash -c "pip3 list && pip3 install pipdeptree && pipdeptree"
+          docker exec pulp bash -c "pip3 list" || true
 ...

.gitignore

@@ -41,6 +41,7 @@ tags
 # Vagrant
 .vagrant
 Vagrantfile
+__pycache__/
 
 # Built documentation
 docs/_build

pulpcore/tests/functional/api/test_status.py

@@ -59,40 +59,24 @@
 
 
 @pytest.mark.parallel
-def test_get_authenticated(test_path, status_api_client, received_otel_span):
+def test_get_authenticated(test_path, pulpcore_bindings):
     """GET the status path with valid credentials.
 
     Verify the response with :meth:`verify_get_response`.
     """
-    response = status_api_client.status_read()
+    response = pulpcore_bindings.StatusApi.status_read()
     verify_get_response(response.to_dict(), STATUS)
-    assert received_otel_span(
-        {
-            "http.method": "GET",
-            "http.target": "/pulp/api/v3/status/",
-            "http.status_code": 200,
-            "http.user_agent": test_path,
-        }
-    )
 
 
 @pytest.mark.parallel
-def test_get_unauthenticated(test_path, status_api_client, anonymous_user, received_otel_span):
+def test_get_unauthenticated(test_path, pulpcore_bindings, anonymous_user):
     """GET the status path with no credentials.
 
     Verify the response with :meth:`verify_get_response`.
     """
     with anonymous_user:
-        response = status_api_client.status_read()
+        response = pulpcore_bindings.StatusApi.status_read()
     verify_get_response(response.to_dict(), STATUS)
-    assert received_otel_span(
-        {
-            "http.method": "GET",
-            "http.target": "/pulp/api/v3/status/",
-            "http.status_code": 200,
-            "http.user_agent": test_path,
-        }
-    )
 
 
 @pytest.mark.parallel
@@ -102,7 +86,6 @@ def test_post_authenticated(
     status_api_client,
     pulpcore_bindings,
     pulp_api_v3_url,
-    received_otel_span,
 ):
     """POST the status path with valid credentials.
 
@@ -118,14 +101,6 @@ def test_post_authenticated(
         pulpcore_bindings.client.request("POST", status_url, headers={"User-Agent": test_path})
 
     assert e.value.status == 405
-    assert received_otel_span(
-        {
-            "http.method": "POST",
-            "http.target": f"{pulp_api_v3_path}status/",
-            "http.status_code": 405,
-            "http.user_agent": test_path,
-        }
-    )
 
 
 @pytest.mark.parallel

releasing.md

@@ -9,19 +9,21 @@
 This document outlines the steps to perform a release.
 
 ### Determine if a Release is Required
+- Make sure to have GitPython python package installed
 - Run the release checker script:
   ```
   python3 .ci/scripts/check_release.py
   ```
 
-### Create a New Y-branch (e.g., 3.23)
-- If a new minor version (Y) is needed, trigger a [Create New Release Branch](https://github.com/pulp/pulpcore/actions/workflows/create-branch.yml) job via the GitHub Actions.
+### Release a New Y-version (e.g., 3.23.0)
+- If a new minor version (Y) is needed, trigger a [Create New Release Branch](https://github.com/pulp/pulpcore/actions/workflows/create-branch.yml) job from the main branch via the GitHub Actions.
 - Look for the "Bump minor version" pull request and merge it.
+- Trigger a [Release Pipeline](https://github.com/pulp/pulpcore/actions/workflows/release.yml) job by specifying the new release branch (X.**Y**) via the GitHub Actions.
 
 ### Release a New Z-version (Patch Release) (e.g., 3.23.1, 3.22.12)
 - Trigger a [Release Pipeline](https://github.com/pulp/pulpcore/actions/workflows/release.yml) job by specifying the release branch (X.Y) via the GitHub Actions.
 
-### Final Steps (Optional but Recommended)
-- Ensure the new version appears on PyPI.
-- Verify that the changelog has been updated by looking for the "Update Changelog" pull request.
-- Post a brief announcement about the new release on the [Pulp Discourse](https://discourse.pulpproject.org/).
+## Final Steps
+- Ensure the new version appears on PyPI (it should appear after [Publish Release](https://github.com/pulp/pulpcore/actions/workflows/publish.yml) workflow succeeds).
+- Verify that the changelog has been updated by looking for the "Update Changelog" pull request (A new PR should be available on the next day).
+- [optional] Post a brief announcement about the new release on the [Pulp Discourse](https://discourse.pulpproject.org/).

template_config.yml

@@ -43,12 +43,7 @@ post_job_template: null
 pre_job_template: null
 pulp_env:
   PULP_CA_BUNDLE: /etc/pulp/certs/pulp_webserver.crt
-pulp_env_azure:
-  otel_bsp_max_export_batch_size: 1
-  otel_bsp_max_queue_size: 1
-  otel_exporter_otlp_endpoint: http://localhost:4318
-  otel_exporter_otlp_protocol: http/protobuf
-  pulp_otel_enabled: 'true'
+pulp_env_azure: {}
 pulp_env_gcp: {}
 pulp_env_s3: {}
 pulp_scheme: https