Switch to using pulp dev branches (#1620)

* Switch to using pulp dev branches No-Issue
ansible · Feb 27, 2023 · 05b8156 · 05b8156
1 parent 5cdaf2d
commit 05b8156
Show file tree

Hide file tree

Showing 18 changed files with 339 additions and 461 deletions.
diff --git a/.ci/assets/release_requirements.txt b/.ci/assets/release_requirements.txt
@@ -1,4 +1,3 @@
 bump2version
 gitpython
-python-redmine
 towncrier
diff --git a/.ci/scripts/check_gettext.sh b/.ci/scripts/check_gettext.sh
@@ -12,7 +12,6 @@ cd "$(dirname "$(realpath -e "$0")")"/../..
 
 set -uv
 
-# check for imports not from pulpcore.plugin. exclude tests
 MATCHES=$(grep -n -r --include \*.py "_(f")
 
 if [ $? -ne 1 ]; then

diff --git a/.ci/scripts/cherrypick.sh b/.ci/scripts/cherrypick.sh
diff --git a/.ci/scripts/redmine.py b/.ci/scripts/redmine.py
diff --git a/.ci/scripts/update_redmine.sh b/.ci/scripts/update_redmine.sh
diff --git a/.github/template_gitref b/.github/template_gitref
@@ -1 +1 @@
-2021.08.26-193-geaaba01
+2021.08.26-197-g21230dd
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,6 +31,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }}
           GITHUB_USER: ${{ github.event.pull_request.user.login }}
+          LOCK_REQUIREMENTS: 0
           GITHUB_PR_COMMITS_URL: ${{ github.event.pull_request.commits_url }}
           START_COMMIT: ${{ github.event.before }}
           END_COMMIT: ${{ github.event.after }}
@@ -139,6 +140,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }}
           GITHUB_USER: ${{ github.event.pull_request.user.login }}
+          LOCK_REQUIREMENTS: 0
 
       - name: Install
 
@@ -154,6 +156,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }}
           GITHUB_USER: ${{ github.event.pull_request.user.login }}
+          LOCK_REQUIREMENTS: 0
 
       - name: Install Python client
 
@@ -174,6 +177,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }}
           GITHUB_USER: ${{ github.event.pull_request.user.login }}
+          LOCK_REQUIREMENTS: 0
           REDIS_DISABLED: ${{ contains('', matrix.env.TEST) }}
 
       - name: Setting secrets
@@ -196,6 +200,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }}
           GITHUB_USER: ${{ github.event.pull_request.user.login }}
+          LOCK_REQUIREMENTS: 0
 
       - name: Extract Deprecations from Logs
         id: deprecations

diff --git a/.github/workflows/ci_standalone-certified-sync.yml b/.github/workflows/ci_standalone-certified-sync.yml
@@ -59,7 +59,7 @@ jobs:
 
       - name: finish insights instance setup
         run: |
-          oci-env -e dev/oci_env_configs/sync-test.compose.env db restore -f insights-fixture
+          oci-env -e dev/oci_env_configs/sync-test.compose.env db restore -f insights-fixture --migrate
           oci-env -e dev/oci_env_configs/sync-test.compose.env pulpcore-manager migrate
           oci-env -e dev/oci_env_configs/sync-test.compose.env poll
 

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -25,6 +25,7 @@ jobs:
           - TEST: pulp
           - TEST: azure
           - TEST: s3
+
 
     steps:
       - uses: actions/checkout@v3
@@ -62,6 +63,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }}
           GITHUB_USER: ${{ github.event.pull_request.user.login }}
+          LOCK_REQUIREMENTS: 0
 
       - uses: ruby/setup-ruby@v1
         if: ${{ env.TEST == 'bindings' || env.TEST == 'generate-bindings' }}
@@ -82,6 +84,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }}
           GITHUB_USER: ${{ github.event.pull_request.user.login }}
+          LOCK_REQUIREMENTS: 0
 
       - name: Before Script
 
@@ -97,6 +100,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }}
           GITHUB_USER: ${{ github.event.pull_request.user.login }}
+          LOCK_REQUIREMENTS: 0
           REDIS_DISABLED: ${{ contains('', matrix.env.TEST) }}
 
       - name: Setting secrets
@@ -129,6 +133,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }}
           GITHUB_USER: ${{ github.event.pull_request.user.login }}
+          LOCK_REQUIREMENTS: 0
 
       - name: Upload python client packages
         if: ${{ env.TEST == 'bindings' || env.TEST == 'generate-bindings' }}
@@ -260,6 +265,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }}
           GITHUB_USER: ${{ github.event.pull_request.user.login }}
+          LOCK_REQUIREMENTS: 0
 
       - name: Install
 
@@ -275,6 +281,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }}
           GITHUB_USER: ${{ github.event.pull_request.user.login }}
+          LOCK_REQUIREMENTS: 0
 
       - name: Install Python client
 
@@ -300,6 +307,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }}
           GITHUB_USER: ${{ github.event.pull_request.user.login }}
+          LOCK_REQUIREMENTS: 0
           REDIS_DISABLED: ${{ contains('', matrix.env.TEST) }}
 
       - name: Setting secrets
@@ -310,10 +318,6 @@ jobs:
 
 
 
-
-
-
-
       - name: Logs
         if: always()
         run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -43,7 +43,7 @@ jobs:
       - name: Install python dependencies
         run: |
           echo ::group::PYDEPS
-          pip install packaging~=21.3 bandersnatch bump2version gitpython python-redmine towncrier==19.9.0 wheel
+          pip install packaging~=21.3 bandersnatch bump2version gitpython towncrier==19.9.0 wheel
           echo ::endgroup::
 
       - name: Configure Git with ansible name and email
@@ -132,6 +132,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }}
           GITHUB_USER: ${{ github.event.pull_request.user.login }}
+          LOCK_REQUIREMENTS: 0
 
       - name: Install
         run: |
@@ -147,6 +148,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }}
           GITHUB_USER: ${{ github.event.pull_request.user.login }}
+          LOCK_REQUIREMENTS: 0
         shell: bash
 
       - name: Before Script
@@ -163,6 +165,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }}
           GITHUB_USER: ${{ github.event.pull_request.user.login }}
+          LOCK_REQUIREMENTS: 0
           REDIS_DISABLED: ${{ contains('', matrix.env.TEST) }}
 
       - name: Setting secrets
@@ -199,6 +202,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }}
           GITHUB_USER: ${{ github.event.pull_request.user.login }}
+          LOCK_REQUIREMENTS: 0
 
       - name: Upload python client packages
         if: ${{ env.TEST == 'bindings' || env.TEST == 'generate-bindings' }}
@@ -284,16 +288,14 @@ jobs:
       - name: Install python dependencies
         run: |
           echo ::group::PYDEPS
-          pip install gitpython python-redmine requests packaging~=21.3 tweepy
+          pip install gitpython requests packaging~=21.3 tweepy
           echo ::endgroup::
 
       - name: Push branch and tag to GitHub
         run: bash .github/workflows/scripts/push_branch_and_tag_to_github.sh ${{ github.event.inputs.release }}
 
 
 
-
-
       - name: Tweet
         continue-on-error: true
         run: python .ci/scripts/tweet.py ${{ github.event.inputs.release }}

diff --git a/.github/workflows/scripts/before_install.sh b/.github/workflows/scripts/before_install.sh
@@ -100,7 +100,7 @@ fi
 
 
 
-git clone --depth=1 https://github.com/pulp/pulpcore.git --branch 3.22.1
+git clone --depth=1 https://github.com/pulp/pulpcore.git --branch main
 
 cd pulpcore
 
@@ -111,7 +111,7 @@ fi
 cd ..
 
 
-git clone --depth=1 https://github.com/pulp/pulp_ansible.git --branch 0.16.0
+git clone --depth=1 https://github.com/pulp/pulp_ansible.git --branch main
 cd pulp_ansible
 
 if [ -n "$PULP_ANSIBLE_PR_NUMBER" ]; then

diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh
@@ -28,7 +28,7 @@ TAG=ci_build
 if [ -e $REPO_ROOT/../pulp_ansible ]; then
   PULP_ANSIBLE=./pulp_ansible
 else
-  PULP_ANSIBLE=git+https://github.com/pulp/pulp_ansible.git@0.16.0
+  PULP_ANSIBLE=git+https://github.com/pulp/pulp_ansible.git@main
 fi
 if [ -e $REPO_ROOT/../pulp_container ]; then
   PULP_CONTAINER=./pulp_container

diff --git a/.github/workflows/scripts/release.py b/.github/workflows/scripts/release.py
@@ -79,9 +79,7 @@ def create_release_commits(repo, release_version, plugin_path):
     git.add(f"{plugin_path}/setup.py")
     git.add(f"{plugin_path}/requirements.txt")
     git.add(f"{plugin_path}/.bumpversion.cfg")
-
     git.commit("-m", f"Release {release_version}\nGH Issues: {issues}\n\n[noissue]")
-
     sha = repo.head.object.hexsha
     short_sha = git.rev_parse(sha, short=7)
 
@@ -101,7 +99,6 @@ def create_release_commits(repo, release_version, plugin_path):
     git.add(f"{plugin_path}/requirements.txt")
     git.add(f"{plugin_path}/.bumpversion.cfg")
     git.commit("-m", f"Bump to {new_dev_version}\n\n[noissue]")
-
     print(f"Release commit == {short_sha}")
     print(f"All changes were committed on branch: release_{release_version}")
     return sha
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,6 @@ cd "$(dirname "$(realpath -e "$0")")"/../.. @@
     set -uv
-    # check for imports not from pulpcore.plugin. exclude tests
     MATCHES=$(grep -n -r --include \*.py "_(f")
     if [ $? -ne 1 ]; then
@@ Expand Down @@