Merge pull request #538 from pulp/create-pull-request/main/patch

Update CI files from main branch

Author: fao89

.github/template_gitref

@@ -1 +1 @@
-2021.08.26-135-gf245075
+2021.08.26-136-ga3c43d7

.github/workflows/ci.yml

@@ -205,134 +205,6 @@ jobs:
           docker exec pulp ls -latr /etc/yum.repos.d/ || true
           docker exec pulp cat /etc/yum.repos.d/* || true
           docker exec pulp pip3 list
-
-  upgrade:
-    runs-on: ubuntu-latest
-    needs: lint
-
-    strategy:
-      fail-fast: false
-      matrix:
-        env:
-          - TEST: upgrade
-            FROM_PULPCORE_BRANCH: "3.11"
-            FROM_PULP_PYTHON_BRANCH: "3.2"
-    outputs:
-      deprecations-upgrade: ${{ steps.deprecations.outputs.deprecations-upgrade }}
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          # by default, it uses a depth of 1
-          # this fetches all history so that we can read each commit
-          fetch-depth: 0
-
-      - uses: actions/setup-python@v3
-        with:
-          python-version: "3.8"
-
-      - name: Install httpie
-        run: |
-          echo ::group::HTTPIE
-          pip install httpie
-          echo ::endgroup::
-          echo "HTTPIE_CONFIG_DIR=$GITHUB_WORKSPACE/.ci/assets/httpie/" >> $GITHUB_ENV
-
-      - name: Set environment variables
-        run: |
-          echo "TEST=${{ matrix.env.TEST }}" >> $GITHUB_ENV
-          echo "FROM_PULP_PYTHON_BRANCH=${{ matrix.env.FROM_PULP_PYTHON_BRANCH }}" >> $GITHUB_ENV
-          echo "FROM_PULPCORE_BRANCH=${{ matrix.env.FROM_PULPCORE_BRANCH }}" >> $GITHUB_ENV
-
-      - name: Install python dependencies
-        run: |
-          echo ::group::PYDEPS
-          pip install wheel
-          echo ::endgroup::
-
-      - name: Before Install
-        
-        run: .github/workflows/scripts/before_install.sh
-        shell: bash
-        env:
-          PY_COLORS: '1'
-          ANSIBLE_FORCE_COLOR: '1'
-          GITHUB_PULL_REQUEST: ${{ github.event.number }}
-          GITHUB_PULL_REQUEST_BODY: ${{ github.event.pull_request.body }}
-          GITHUB_BRANCH: ${{ github.head_ref }}
-          GITHUB_REPO_SLUG: ${{ github.repository }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }}
-
-      - name: Install
-        
-        run: .github/workflows/scripts/install.sh
-        shell: bash
-        env:
-          PY_COLORS: '1'
-          ANSIBLE_FORCE_COLOR: '1'
-          GITHUB_PULL_REQUEST: ${{ github.event.number }}
-          GITHUB_PULL_REQUEST_BODY: ${{ github.event.pull_request.body }}
-          GITHUB_BRANCH: ${{ github.head_ref }}
-          GITHUB_REPO_SLUG: ${{ github.repository }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }}
-
-      - name: Install Python client
-        
-        run: .github/workflows/scripts/install_python_client.sh
-        shell: bash
-
-      - name: Before Script
-        
-        run: .github/workflows/scripts/before_script.sh
-        shell: bash
-        env:
-          PY_COLORS: '1'
-          ANSIBLE_FORCE_COLOR: '1'
-          GITHUB_PULL_REQUEST: ${{ github.event.number }}
-          GITHUB_PULL_REQUEST_BODY: ${{ github.event.pull_request.body }}
-          GITHUB_BRANCH: ${{ github.head_ref }}
-          GITHUB_REPO_SLUG: ${{ github.repository }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }}
-          REDIS_DISABLED: ${{ contains('', matrix.env.TEST) }}
-
-      - name: Setting secrets
-        
-        run: python3 .github/workflows/scripts/secrets.py "$SECRETS_CONTEXT"
-        env:
-          SECRETS_CONTEXT: ${{ toJson(secrets) }}
-
-      - name: Upgrade Test
-        
-        run: .github/workflows/scripts/script.sh
-        shell: bash
-        env:
-          PY_COLORS: '1'
-          ANSIBLE_FORCE_COLOR: '1'
-          GITHUB_PULL_REQUEST: ${{ github.event.number }}
-          GITHUB_PULL_REQUEST_BODY: ${{ github.event.pull_request.body }}
-          GITHUB_BRANCH: ${{ github.head_ref }}
-          GITHUB_REPO_SLUG: ${{ github.repository }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }}
-
-      - name: Extract Deprecations from Logs
-        id: deprecations
-        run: echo "::set-output name=deprecations-${{ matrix.env.TEST }}::$(docker logs pulp 2>&1 | grep -i pulpcore.deprecation | base64 -w 0)"
-
-      - name: Logs
-        if: always()
-        run: |
-          echo "Need to debug? Please check: https://github.com/marketplace/actions/debugging-with-tmate"
-          http --timeout 30 --check-status --pretty format --print hb "https://pulp${PULP_API_ROOT}api/v3/status/" || true
-          docker images || true
-          docker ps -a || true
-          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 pip3 list
   deprecations:
     runs-on: ubuntu-latest
     if: always()
@@ -343,13 +215,11 @@ jobs:
           test -z "${{ needs.test.outputs.deprecations-pulp }}"
           test -z "${{ needs.test.outputs.deprecations-azure }}"
           test -z "${{ needs.test.outputs.deprecations-s3 }}"
-          test -z "${{ needs.test.outputs.deprecations-upgrade }}"
       - name: Print deprecations
         if: failure()
         run: |
           echo "${{ needs.test.outputs.deprecations-pulp }}" | base64 -d
           echo "${{ needs.test.outputs.deprecations-azure }}" | base64 -d
           echo "${{ needs.test.outputs.deprecations-s3 }}" | base64 -d
-          echo "${{ needs.test.outputs.deprecations-upgrade }}" | base64 -d
 
 

.github/workflows/scripts/before_install.sh

@@ -104,21 +104,6 @@ if [ -n "$PULP_OPENAPI_GENERATOR_PR_NUMBER" ]; then
 fi
 
 
-git clone --depth=1 https://github.com/pulp/pulp-cli.git
-if [ -n "$PULP_CLI_PR_NUMBER" ]; then
-  cd pulp-cli
-  git fetch origin pull/$PULP_CLI_PR_NUMBER/head:$PULP_CLI_PR_NUMBER
-  git checkout $PULP_CLI_PR_NUMBER
-  cd ..
-fi
-
-cd pulp-cli
-pip install -e .
-pulp config create --base-url https://pulp --location tests/cli.toml 
-mkdir ~/.config/pulp
-cp tests/cli.toml ~/.config/pulp/cli.toml
-cd ..
-
 
 git clone --depth=1 https://github.com/pulp/pulpcore.git --branch main
 
@@ -131,16 +116,6 @@ fi
 cd ..
 
 
-
-if [[ "$TEST" == "upgrade" ]]; then
-  cd pulpcore
-  git checkout -b ci_upgrade_test
-  git fetch --depth=1 origin heads/$FROM_PULPCORE_BRANCH:$FROM_PULPCORE_BRANCH
-  git checkout $FROM_PULPCORE_BRANCH
-  cd ..
-fi
-
-
 # Intall requirements for ansible playbooks
 pip install docker netaddr boto3 ansible
 

.github/workflows/scripts/script.sh

@@ -98,65 +98,6 @@ fi
 # Run functional tests
 export PYTHONPATH=$REPO_ROOT${PYTHONPATH:+:${PYTHONPATH}}
 
-
-if [[ "$TEST" == "upgrade" ]]; then
-  # Handle app label change:
-  sed -i "/require_pulp_plugins(/d" pulp_python/tests/functional/utils.py
-
-  # Running pre upgrade tests:
-  pytest -v -r sx --color=yes --pyargs --capture=no pulp_python.tests.upgrade.pre
-
-  # Checking out ci_upgrade_test branch and upgrading plugins
-  cmd_prefix bash -c "cd pulpcore; git checkout -f ci_upgrade_test; pip install --upgrade --force-reinstall ."
-  cmd_prefix bash -c "cd pulp_python; git checkout -f ci_upgrade_test; pip install ."
-
-  # Migrating
-  cmd_prefix bash -c "django-admin migrate --no-input"
-
-  # Restarting single container services
-  cmd_prefix bash -c "s6-svc -r /var/run/s6/services/pulpcore-api"
-  cmd_prefix bash -c "s6-svc -r /var/run/s6/services/pulpcore-content"
-  cmd_prefix bash -c "s6-svc -d /var/run/s6/services/pulpcore-resource-manager"
-  cmd_prefix bash -c "s6-svc -d /var/run/s6/services/pulpcore-worker@1"
-  cmd_prefix bash -c "s6-svc -d /var/run/s6/services/pulpcore-worker@2"
-  cmd_prefix bash -c "s6-svc -u /var/run/s6/services/new-pulpcore-resource-manager"
-  cmd_prefix bash -c "s6-svc -u /var/run/s6/services/new-pulpcore-worker@1"
-  cmd_prefix bash -c "s6-svc -u /var/run/s6/services/new-pulpcore-worker@2"
-
-  echo "Restarting in 60 seconds"
-  sleep 60
-
-  # Let's reinstall pulpcore so we can ensure we have the correct dependencies
-  cd ../pulpcore
-  git checkout -f ci_upgrade_test
-  pip install --upgrade --force-reinstall . ../pulp-cli ../pulp-smash
-  # Hack: adding pulp CA to certifi.where()
-  CERTIFI=$(python -c 'import certifi; print(certifi.where())')
-  cat /usr/local/share/ca-certificates/pulp_webserver.crt | sudo tee -a "$CERTIFI" > /dev/null
-  # CLI commands to display plugin versions and content data
-  pulp status
-  pulp content list
-  CONTENT_LENGTH=$(pulp content list | jq length)
-  if [[ "$CONTENT_LENGTH" == "0" ]]; then
-    echo "Empty content list"
-    exit 1
-  fi
-
-  # Rebuilding bindings
-  cd ../pulp-openapi-generator
-  ./generate.sh pulpcore python
-  pip install ./pulpcore-client
-  ./generate.sh pulp_python python
-  pip install ./pulp_python-client
-  cd $REPO_ROOT
-
-  # Running post upgrade tests
-  git checkout ci_upgrade_test -- pulp_python/tests/
-  pytest -v -r sx --color=yes --pyargs --capture=no pulp_python.tests.upgrade.post
-  exit
-fi
-
-
 if [[ "$TEST" == "performance" ]]; then
   if [[ -z ${PERFORMANCE_TEST+x} ]]; then
     pytest -vv -r sx --color=yes --pyargs --capture=no --durations=0 pulp_python.tests.performance