Skip to content

Commit d391c81

Browse files
committed
Update CI files
[noissue]
1 parent be21549 commit d391c81

File tree

6 files changed

+22
-17
lines changed

6 files changed

+22
-17
lines changed

.github/template_gitref

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2021.08.26-207-g81d81f6
1+
2021.08.26-212-g18b9346

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
steps:
3333
- uses: actions/checkout@v3
3434
with:
35-
fetch-depth: 1
35+
fetch-depth: 0
3636

3737
- uses: actions/setup-python@v3
3838
with:

.github/workflows/scripts/before_install.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,6 @@ cd ..
6060

6161
git clone --depth=1 https://github.com/pulp/pulp-openapi-generator.git
6262

63-
pip install pulp-cli
64-
65-
PULP_CLI_VERSION="$(pip freeze | sed -n -e 's/pulp-cli==//p')"
66-
git clone --depth 1 --branch "$PULP_CLI_VERSION" https://github.com/pulp/pulp-cli.git
67-
68-
6963
# Intall requirements for ansible playbooks
7064
pip install docker netaddr boto3 ansible
7165

.github/workflows/scripts/install.sh

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,20 @@ source .github/workflows/scripts/utils.sh
1717

1818
export PULP_API_ROOT="/pulp/"
1919

20-
if [[ "$TEST" = "docs" || "$TEST" = "publish" ]]; then
21-
cd ..
22-
git clone https://github.com/pulp/pulpcore.git
23-
cd -
24-
pip install -r ../pulpcore/doc_requirements.txt
25-
pip install -r doc_requirements.txt
20+
PIP_REQUIREMENTS=("pulp-cli")
21+
if [[ "$TEST" = "docs" || "$TEST" = "publish" ]]
22+
then
23+
PIP_REQUIREMENTS+=("-r" "doc_requirements.txt")
24+
git clone https://github.com/pulp/pulpcore.git ../pulpcore
25+
PIP_REQUIREMENTS+=("psycopg2-binary" "-r" "../pulpcore/doc_requirements.txt")
26+
fi
27+
28+
pip install ${PIP_REQUIREMENTS[*]}
29+
30+
if [[ "$TEST" != "docs" ]]
31+
then
32+
PULP_CLI_VERSION="$(pip freeze | sed -n -e 's/pulp-cli==//p')"
33+
git clone --depth 1 --branch "$PULP_CLI_VERSION" https://github.com/pulp/pulp-cli.git ../pulp-cli
2634
fi
2735

2836
cd .ci/ansible/
@@ -110,7 +118,9 @@ if [ "${PULP_API_ROOT:-}" ]; then
110118
fi
111119

112120
pulp config create --base-url https://pulp --api-root "$PULP_API_ROOT"
113-
cp ~/.config/pulp/cli.toml "${REPO_ROOT}/../pulp-cli/tests/cli.toml"
121+
if [[ "$TEST" != "docs" ]]; then
122+
cp ~/.config/pulp/cli.toml "${REPO_ROOT}/../pulp-cli/tests/cli.toml"
123+
fi
114124

115125
ansible-playbook build_container.yaml
116126
ansible-playbook start_container.yaml

.github/workflows/scripts/script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ cmd_prefix bash -c "cat /etc/pulp/certs/pulp_webserver.crt | tee -a "$CERTIFI"
9999

100100
# check for any uncommitted migrations
101101
echo "Checking for uncommitted migrations..."
102-
cmd_user_prefix bash -c "django-admin makemigrations --check --dry-run"
102+
cmd_user_prefix bash -c "django-admin makemigrations python --check --dry-run"
103103

104104
# Run unit tests.
105105
cmd_user_prefix bash -c "PULP_DATABASES__default__USER=postgres pytest -v -r sx --color=yes -p no:pulpcore --pyargs pulp_python.tests.unit"

template_config.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This config represents the latest values used when running the plugin-template. Any settings that
22
# were not present before running plugin-template have been added with their default values.
33

4-
# generated with [email protected]202-g6f2c165
4+
# generated with [email protected]212-g18b9346
55

66
additional_repos: []
77
api_root: /pulp/
@@ -20,6 +20,7 @@ deploy_client_to_pypi: true
2020
deploy_client_to_rubygems: true
2121
deploy_to_pypi: true
2222
disabled_redis_runners: []
23+
doc_requirements_from_pulpcore: true
2324
docker_fixtures: false
2425
docs_test: true
2526
flake8: true

0 commit comments

Comments
 (0)