Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

Commit

Permalink
Make the CI for the main branch use pulpcore 3.19
Browse files Browse the repository at this point in the history
since nothing beyond is supported

[noissue]
  • Loading branch information
goosemania authored and fao89 committed Jun 27, 2022
1 parent 36e9fe6 commit a12499c
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 37 deletions.
2 changes: 1 addition & 1 deletion .github/template_gitref
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2021.08.26-137-gaeb6e72
2021.08.26-140-g5de156f
10 changes: 5 additions & 5 deletions .github/workflows/scripts/before_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ cp tests/cli.toml ~/.config/pulp/cli.toml
cd ..


git clone --depth=1 https://github.com/pulp/pulpcore.git --branch main
git clone --depth=1 https://github.com/pulp/pulpcore.git --branch 3.19

cd pulpcore

Expand All @@ -139,7 +139,7 @@ fi
cd ..


git clone --depth=1 https://github.com/pulp/pulp_file.git --branch main
git clone --depth=1 https://github.com/pulp/pulp_file.git --branch 1.10
cd pulp_file

if [ -n "$PULP_FILE_PR_NUMBER" ]; then
Expand All @@ -149,7 +149,7 @@ fi

cd ..

git clone --depth=1 https://github.com/pulp/pulp_container.git --branch main
git clone --depth=1 https://github.com/pulp/pulp_container.git --branch 2.12
cd pulp_container

if [ -n "$PULP_CONTAINER_PR_NUMBER" ]; then
Expand All @@ -159,7 +159,7 @@ fi

cd ..

git clone --depth=1 https://github.com/pulp/pulp_rpm.git --branch main
git clone --depth=1 https://github.com/pulp/pulp_rpm.git --branch 3.17
cd pulp_rpm

if [ -n "$PULP_RPM_PR_NUMBER" ]; then
Expand All @@ -169,7 +169,7 @@ fi

cd ..

git clone --depth=1 https://github.com/pulp/pulp_deb.git --branch main
git clone --depth=1 https://github.com/pulp/pulp_deb.git --branch 2.18
cd pulp_deb

if [ -n "$PULP_DEB_PR_NUMBER" ]; then
Expand Down
27 changes: 12 additions & 15 deletions .github/workflows/scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,36 +22,33 @@ if [[ "$TEST" = "docs" || "$TEST" = "publish" ]]; then
pip install -r doc_requirements.txt
fi

pip install -e ../pulpcore
pip install -e ../pulpcore -e ../pulp_file -e ../pulp_container -e ../pulp_rpm -e ../pulp_deb
pip install -r functest_requirements.txt

cd .ci/ansible/

TAG=ci_build

if [ -e $REPO_ROOT/../pulp_file ]; then
PULP_FILE=./pulp_file
else
PULP_FILE=git+https://github.com/pulp/pulp_file.git@main
PULP_FILE=git+https://github.com/pulp/pulp_file.git@1.10
fi

if [ -e $REPO_ROOT/../pulp_container ]; then
PULP_CONTAINER=./pulp_container
else
PULP_CONTAINER=git+https://github.com/pulp/pulp_container.git@main
PULP_CONTAINER=git+https://github.com/pulp/pulp_container.git@2.12
fi

if [ -e $REPO_ROOT/../pulp_rpm ]; then
PULP_RPM=./pulp_rpm
else
PULP_RPM=git+https://github.com/pulp/pulp_rpm.git@main
PULP_RPM=git+https://github.com/pulp/pulp_rpm.git@3.17
fi

if [ -e $REPO_ROOT/../pulp_deb ]; then
PULP_DEB=./pulp_deb
else
PULP_DEB=git+https://github.com/pulp/pulp_deb.git@main
PULP_DEB=git+https://github.com/pulp/pulp_deb.git@2.18
fi
PULPCORE=./pulpcore
if [[ "$TEST" == "plugin-from-pypi" ]]; then
PLUGIN_NAME=pulp-2to3-migration
elif [[ "${RELEASE_WORKFLOW:-false}" == "true" ]]; then
Expand All @@ -68,17 +65,17 @@ image:
tag: "${TAG}"
plugins:
- name: pulpcore
source: pulpcore
source: pulpcore~=3.19.0
- name: pulp-2to3-migration
source: "${PLUGIN_NAME}"
- name: pulp_file
source: pulp_file
source: pulp_file~=1.10.0
- name: pulp_container
source: pulp_container
source: pulp_container~=2.12.0
- name: pulp_rpm
source: pulp_rpm
source: pulp_rpm~=3.17.0
- name: pulp_deb
source: pulp_deb
source: pulp_deb~=2.18.0
VARSYAML
else
cat >> vars/main.yaml << VARSYAML
Expand All @@ -97,7 +94,7 @@ plugins:
- name: pulp_deb
source: $PULP_DEB
- name: pulpcore
source: ./pulpcore
source: "${PULPCORE}"
VARSYAML
fi

Expand Down
10 changes: 0 additions & 10 deletions .github/workflows/scripts/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -113,16 +113,6 @@ if [[ "$TEST" = 'bindings' ]]; then
fi
cd $REPO_ROOT

if [[ "$TEST" = 'bindings' ]]; then
if [ -f $REPO_ROOT/.ci/assets/bindings/test_bindings.py ]; then
python $REPO_ROOT/.ci/assets/bindings/test_bindings.py
fi
if [ -f $REPO_ROOT/.ci/assets/bindings/test_bindings.rb ]; then
ruby $REPO_ROOT/.ci/assets/bindings/test_bindings.rb
fi
exit
fi

cat unittest_requirements.txt | cmd_stdin_prefix bash -c "cat > /tmp/unittest_requirements.txt"
cmd_prefix pip3 install -r /tmp/unittest_requirements.txt

Expand Down
16 changes: 10 additions & 6 deletions template_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,18 @@
# generated with [email protected]

additional_repos:
- branch: main
- branch: '1.10'
name: pulp_file
- branch: main
pip_version_specifier: ~=1.10.0
- branch: '2.12'
name: pulp_container
- branch: main
pip_version_specifier: ~=2.12.0
- branch: '3.17'
name: pulp_rpm
- branch: main
pip_version_specifier: ~=3.17.0
- branch: '2.18'
name: pulp_deb
pip_version_specifier: ~=2.18.0
aiohttp_fixtures_origin: 172.18.0.1
api_root: /pulp/
black: false
Expand Down Expand Up @@ -54,8 +58,8 @@ pre_job_template: null
publish_docs_to_pulpprojectdotorg: true
pulp_scheme: https
pulp_settings: null
pulpcore_branch: main
pulpcore_pip_version_specifier: null
pulpcore_branch: '3.19'
pulpcore_pip_version_specifier: ~=3.19.0
pulpcore_revision: null
pulpprojectdotorg_key_id: null
pydocstyle: false
Expand Down

0 comments on commit a12499c

Please sign in to comment.