Update CI from template

[noissue]

Author: dralley

.ci/scripts/cherrypick.sh

@@ -23,27 +23,42 @@ issue="$2"
 backport="$3"
 commit_message=$(git log --format=%B -n 1 $commit)
 
-if ! echo $commit_message | grep -q "\[noissue\]"
+if ! echo $commit_message | tr '[:upper:]' '[:lower:]' | grep -q "\[noissue\]"
 then
-  if ! echo $commit_message | grep -q -E "(fixes|closes).*#$issue"
+  if ! echo $commit_message | tr '[:upper:]' '[:lower:]' | grep -q -E "(fixes|closes).*#$issue"
   then
     echo "Error: issue $issue not detected in commit message." && exit 1
   fi
 fi
 
-git cherry-pick --no-commit "$commit"
+if [ "$4" = "--continue" ]
+then
+  echo "Continue after manually resolving conflicts..."
+elif [ "$4" = "" ]
+then
+  if ! git cherry-pick --no-commit "$commit"
+  then
+    echo "Please resolve and add merge conflicts and restart this command with appended '--continue'."
+    exit 1
+  fi
+else
+  exit 1
+fi
 
 for file in $(find CHANGES -name "$issue.*")
 do
-  git mv "$file" "${file/$issue/$backport}"
+  newfile="${file/$issue/$backport}"
+  git mv "$file" "$newfile"
+  sed -i -e "\$a (backported from #$issue)" "$newfile"
+  git add "$newfile"
 done
 
-commit_message="$(printf "$commit_message" | sed -E 's/(fixes|closes)/backports/')"
+commit_message="$(printf "$commit_message" | sed -E 's/(fixes|closes)/backports/i')"
 commit_message="$commit_message
 
 fixes #$backport
 
 (cherry picked from commit $commit)"
-git commit -a -m "$commit_message"
+git commit -m "$commit_message"
 
-printf "\nSuccessfully backported commit $1."
+printf "\nSuccessfully backported commit $1.\n"

.github/workflows/scripts/before_install.sh

@@ -27,6 +27,18 @@ else
   BRANCH="${GITHUB_REF##refs/tags/}"
 fi
 
+if [[ "$TEST" == "upgrade" ]]; then
+  git checkout -b ci_upgrade_test
+  cp -R .github /tmp/.github
+  cp -R .ci /tmp/.ci
+  git checkout $FROM_PULPCORE_BRANCH
+  rm -rf .ci .github
+  cp -R /tmp/.github .
+  cp -R /tmp/.ci .
+  # Pin deps
+  sed -i "s/~/=/g" requirements.txt
+fi
+
 if [[ "$TEST" == "plugin-from-pypi" ]]; then
   COMPONENT_VERSION=$(http https://pypi.org/pypi/pulpcore/json | jq -r '.info.version')
 else
@@ -72,8 +84,11 @@ else
   export CI_BASE_IMAGE=
 fi
 
+
 cd ..
 
+
+
 git clone --depth=1 https://github.com/pulp/pulp-openapi-generator.git
 if [ -n "$PULP_OPENAPI_GENERATOR_PR_NUMBER" ]; then
   cd pulp-openapi-generator
@@ -94,13 +109,14 @@ fi
 cd pulp-cli
 pip install -e .
 pulp config create --base-url http://pulp --location tests/settings.toml
+sed -i "s/true/false/g" tests/settings.toml
+mkdir ~/.config/pulp
+cp tests/settings.toml ~/.config/pulp/settings.toml
 cd ..
 
 
 
 
-
-
 git clone --depth=1 https://github.com/pulp/pulp_file.git --branch master
 if [ -n "$PULP_FILE_PR_NUMBER" ]; then
   cd pulp_file
@@ -117,6 +133,8 @@ if [ -n "$PULP_CERTGUARD_PR_NUMBER" ]; then
   cd ..
 fi
 
+
+
 # Intall requirements for ansible playbooks
 pip install docker netaddr boto3 ansible
 

.github/workflows/scripts/before_script.sh

@@ -29,7 +29,7 @@ tail -v -n +1 .ci/ansible/vars/main.yaml
 echo "PULP CONFIG:"
 tail -v -n +1 .ci/ansible/settings/settings.* ~/.config/pulp_smash/settings.json
 
-if [[ "$TEST" == 'pulp' || "$TEST" == 'performance' || "$TEST" == 's3' || "$TEST" == "plugin-from-pypi" ]]; then
+if [[ "$TEST" == 'pulp' || "$TEST" == 'performance' || "$TEST" == 'upgrade' || "$TEST" == 's3' || "$TEST" == "plugin-from-pypi" ]]; then
   # Many functional tests require these
   cmd_prefix dnf install -yq lsof which dnf-plugins-core
 fi

.github/workflows/scripts/install.sh

@@ -66,7 +66,7 @@ cat >> vars/main.yaml << VARSYAML
 pulp_settings: {"allowed_export_paths": ["/tmp"], "allowed_import_paths": ["/tmp"]}
 VARSYAML
 
-if [[ "$TEST" == "pulp" || "$TEST" == "performance" || "$TEST" == "s3" || "$TEST" == "plugin-from-pypi" ]]; then
+if [[ "$TEST" == "pulp" || "$TEST" == "performance" || "$TEST" == "upgrade" || "$TEST" == "s3" || "$TEST" == "plugin-from-pypi" ]]; then
   sed -i -e '/^services:/a \
   - name: pulp-fixtures\
     image: docker.io/pulp/pulp-fixtures:latest\

.github/workflows/scripts/script.sh

@@ -98,6 +98,8 @@ cmd_prefix bash -c "PULP_DATABASES__default__USER=postgres django-admin test --n
 # Run functional tests
 export PYTHONPATH=$REPO_ROOT${PYTHONPATH:+:${PYTHONPATH}}
 
+
+
 if [[ "$TEST" == "performance" ]]; then
   if [[ -z ${PERFORMANCE_TEST+x} ]]; then
     pytest -vv -r sx --color=yes --pyargs --capture=no --durations=0 pulpcore.tests.performance

template_config.yml

@@ -64,4 +64,5 @@ travis_notifications:
     - 'Build details : %{build_url}'
     - '%{message}'
 update_redmine: true
+upgrade_range: []