Deprecate the standalone repository

This plugin has been moved to be an integral part of pulpcore.

[noissue]

.bumpversion.cfg

@@ -14,8 +14,6 @@ values =
 	dev
 	prod
 
-[bumpversion:file:./pulp_certguard/app/__init__.py]
-
 [bumpversion:file:./setup.py]
 
 [bumpversion:file:./docs/conf.py]

.github/template_gitref

@@ -1 +1 @@
-2021.08.26-304-gc53c1e3
+2021.08.26-305-g7d7a050

.github/workflows/ci.yml

@@ -42,9 +42,6 @@ jobs:
           GITHUB_CONTEXT: "${{ github.event.pull_request.commits_url }}"
         run: |
           .github/workflows/scripts/check_commit.sh
-      - name: "Verify requirements files"
-        run: |
-          python .ci/scripts/check_requirements.py
 
   lint:
     uses: "./.github/workflows/lint.yml"
@@ -57,25 +54,6 @@ jobs:
     needs: "build"
     uses: "./.github/workflows/test.yml"
 
-  deprecations:
-    runs-on: "ubuntu-latest"
-    if: github.base_ref == 'main'
-    needs: "test"
-    steps:
-      - name: "Create working directory"
-        run: |
-          mkdir -p "pulp-certguard"
-        working-directory: "."
-      - name: "Download Deprecations"
-        uses: actions/download-artifact@v3
-        with:
-          name: "deprecations"
-          path: "pulp-certguard"
-      - name: "Print deprecations"
-        run: |
-          cat deprecations-*.txt | sort -u
-          ! cat deprecations-*.txt | grep '[^[:space:]]'
-
   ready-to-ship:
     # This is a dummy dependent task to have a single entry for the branch protection rules.
     runs-on: "ubuntu-latest"

.github/workflows/scripts/func_test_script.sh

@@ -0,0 +1 @@
+# Don't run any.

.github/workflows/scripts/install.sh

@@ -32,12 +32,6 @@ pip install ${PIP_REQUIREMENTS[*]}
 
 cd .ci/ansible/
 PLUGIN_SOURCE="${PLUGIN_NAME}"
-if [ "$TEST" = "s3" ]; then
-  PLUGIN_SOURCE="${PLUGIN_SOURCE} pulpcore[s3]"
-fi
-if [ "$TEST" = "azure" ]; then
-  PLUGIN_SOURCE="${PLUGIN_SOURCE} pulpcore[azure]"
-fi
 
 cat >> vars/main.yaml << VARSYAML
 image:
@@ -52,11 +46,6 @@ if [[ -f ../../ci_requirements.txt ]]; then
     ci_requirements: true
 VARSYAML
 fi
-if [ "$TEST" = "lowerbounds" ]; then
-  cat >> vars/main.yaml << VARSYAML
-    lowerbounds: true
-VARSYAML
-fi
 
 cat >> vars/main.yaml << VARSYAML
 services:
@@ -81,44 +70,6 @@ pulp_container_tag: "latest"
 
 VARSYAML
 
-if [ "$TEST" = "s3" ]; then
-  export MINIO_ACCESS_KEY=AKIAIT2Z5TDYPX3ARJBA
-  export MINIO_SECRET_KEY=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
-  sed -i -e '/^services:/a \
-  - name: minio\
-    image: minio/minio\
-    env:\
-      MINIO_ACCESS_KEY: "'$MINIO_ACCESS_KEY'"\
-      MINIO_SECRET_KEY: "'$MINIO_SECRET_KEY'"\
-    command: "server /data"' vars/main.yaml
-  sed -i -e '$a s3_test: true\
-minio_access_key: "'$MINIO_ACCESS_KEY'"\
-minio_secret_key: "'$MINIO_SECRET_KEY'"\
-pulp_scenario_settings: {"domain_enabled": true, "hide_guarded_distributions": true}\
-pulp_scenario_env: {}\
-' vars/main.yaml
-  export PULP_API_ROOT="/rerouted/djnd/"
-fi
-
-if [ "$TEST" = "azure" ]; then
-  mkdir -p azurite
-  cd azurite
-  openssl req -newkey rsa:2048 -x509 -nodes -keyout azkey.pem -new -out azcert.pem -sha256 -days 365 -addext "subjectAltName=DNS:ci-azurite" -subj "/C=CO/ST=ST/L=LO/O=OR/OU=OU/CN=CN"
-  sudo cp azcert.pem /usr/local/share/ca-certificates/azcert.crt
-  sudo dpkg-reconfigure ca-certificates
-  cd ..
-  sed -i -e '/^services:/a \
-  - name: ci-azurite\
-    image: mcr.microsoft.com/azure-storage/azurite\
-    volumes:\
-      - ./azurite:/etc/pulp\
-    command: "azurite-blob --blobHost 0.0.0.0 --cert /etc/pulp/azcert.pem --key /etc/pulp/azkey.pem"' vars/main.yaml
-  sed -i -e '$a azure_test: true\
-pulp_scenario_settings: {"domain_enabled": true}\
-pulp_scenario_env: {}\
-' vars/main.yaml
-fi
-
 echo "PULP_API_ROOT=${PULP_API_ROOT}" >> "$GITHUB_ENV"
 
 if [ "${PULP_API_ROOT:-}" ]; then

.github/workflows/scripts/script.sh

@@ -129,30 +129,29 @@ echo "Checking for uncommitted migrations..."
 cmd_user_prefix bash -c "django-admin makemigrations certguard --check --dry-run"
 
 # Run unit tests.
-cmd_user_prefix bash -c "PULP_DATABASES__default__USER=postgres pytest -v -r sx --color=yes -p no:pulpcore --pyargs pulp_certguard.tests.unit"
+cmd_user_prefix bash -c "PULP_DATABASES__default__USER=postgres pytest -v -r sx --color=yes --suppress-no-test-exit-code -p no:pulpcore --pyargs pulp_certguard.tests.unit"
 
 # Run functional tests
 if [[ "$TEST" == "performance" ]]; then
   if [[ -z ${PERFORMANCE_TEST+x} ]]; then
-    cmd_user_prefix bash -c "pytest -vv -r sx --color=yes --pyargs --capture=no --durations=0 pulp_certguard.tests.performance"
+    cmd_user_prefix bash -c "pytest -vv -r sx --color=yes --suppress-no-test-exit-code --capture=no --durations=0 --pyargs pulp_certguard.tests.performance"
   else
-    cmd_user_prefix bash -c "pytest -vv -r sx --color=yes --pyargs --capture=no --durations=0 pulp_certguard.tests.performance.test_${PERFORMANCE_TEST}"
+    cmd_user_prefix bash -c "pytest -vv -r sx --color=yes --suppress-no-test-exit-code --capture=no --durations=0 --pyargs pulp_certguard.tests.performance.test_${PERFORMANCE_TEST}"
   fi
   exit
 fi
 
 if [ -f "$FUNC_TEST_SCRIPT" ]; then
   source "$FUNC_TEST_SCRIPT"
 else
-    if [[ "$GITHUB_WORKFLOW" == "Certguard Nightly CI/CD" ]]
-    then
-        cmd_user_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_certguard.tests.functional -m parallel -n 8 --nightly"
-        cmd_user_prefix bash -c "pytest -v -r sx --color=yes --pyargs pulp_certguard.tests.functional -m 'not parallel' --nightly"
-
-    else
-        cmd_user_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_certguard.tests.functional -m parallel -n 8"
-        cmd_user_prefix bash -c "pytest -v -r sx --color=yes --pyargs pulp_certguard.tests.functional -m 'not parallel'"
-    fi
+  if [[ "$GITHUB_WORKFLOW" =~ "Nightly" ]]
+  then
+    cmd_user_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_certguard.tests.functional -m parallel -n 8 --nightly"
+    cmd_user_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_certguard.tests.functional -m 'not parallel' --nightly"
+  else
+    cmd_user_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_certguard.tests.functional -m parallel -n 8"
+    cmd_user_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_certguard.tests.functional -m 'not parallel'"
+  fi 
 fi
 
 if [ -f "$POST_SCRIPT" ]; then

.github/workflows/test.yml

@@ -23,9 +23,6 @@ jobs:
         env:
           - TEST: pulp
           - TEST: docs
-          - TEST: azure
-          - TEST: s3
-          - TEST: lowerbounds
 
     steps:
       - uses: "actions/checkout@v4"
@@ -113,18 +110,6 @@ jobs:
           ANSIBLE_FORCE_COLOR: "1"
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           GITHUB_CONTEXT: "${{ github.event.pull_request.commits_url }}"
-
-      - name: "Extract Deprecations from Logs"
-        run: |
-          docker logs pulp 2>&1 | grep -i pulpcore.deprecation | tee deprecations-${{ matrix.env.TEST }}.txt
-
-      - name: "Upload Deprecations"
-        uses: actions/upload-artifact@v3
-        with:
-          name: "deprecations"
-          path: "pulp-certguard/deprecations-${{ matrix.env.TEST }}.txt"
-          if-no-files-found: "error"
-          retention-days: 5
       - name: Upload python client packages
         if: ${{ env.TEST == 'pulp' }}
         uses: actions/upload-artifact@v3

README.rst

@@ -1,6 +1,9 @@
 pulp-certguard
 ==============
 
+.. warning:: This pulp plugin has been merged into the main pulpcore project.
+   This repository can only accept bugfixes on release branches.
+
 .. figure:: https://github.com/pulp/pulp-certguard/actions/workflows/nightly.yml/badge.svg?branch=main
    :alt: Certguard Nightly CI/CD
 
@@ -10,3 +13,10 @@ to content before receiving the content.
 
 For more information, please see the `documentation <https://docs.pulpproject.org/pulp_certguard>`_
 or the `Pulp project page <https://pulpproject.org>`_.
+
+Development moved to Pulpcore
+-----------------------------
+
+Since this plugin has been moved to pulpcore, issues can no longer be reported here. Please go to
+`Pulpcore - Issues <https://github.com/pulp/pulpcore/issues>`_ instead.
+Any issues that arise should also be solved there first and if needed backported here.