Skip to content

Commit 702ca6e

Browse files
authored
Merge pull request #755 from pulp/update-ci/main
Update CI files for branch main
2 parents 183d470 + bdb5d4b commit 702ca6e

File tree

5 files changed

+4
-10
lines changed

5 files changed

+4
-10
lines changed

.ci/ansible/Containerfile.j2

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ RUN pip3 install --upgrade pip setuptools wheel && \
2828
{{ " " }}-r ./{{ item.name }}/ci_requirements.txt
2929
{%- endif -%}
3030
{%- endfor %}
31-
{{ " " }}-c ./{{ plugins[0].name }}/.ci/assets/ci_constraints.txt \
32-
pipdeptree && \
31+
{{ " " }}-c ./{{ plugins[0].name }}/.ci/assets/ci_constraints.txt && \
3332
rm -rf /root/.cache/pip
3433

3534
{% if pulp_env is defined and pulp_env %}

.ci/assets/ci_constraints.txt

-5
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,3 @@ pulpcore>=3.21.30,!=3.23.*,!=3.24.*,!=3.25.*,!=3.26.*,!=3.27.*,!=3.29.*,!=3.30.*
55

66
tablib!=3.6.0
77
# 3.6.0: This release introduced a regression removing the "html" optional dependency.
8-
9-
10-
11-
# Newer version seem to have a conflict around packaging, that pip fails to resolve in time. Remove this when this starts to impose an issue.
12-
pipdeptree<=3.23.1

.github/template_gitref

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2021.08.26-387-ge627e91
1+
2021.08.26-388-g624de1a

.github/workflows/scripts/install.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,5 +156,5 @@ if [[ "$TEST" = "azure" ]]; then
156156
fi
157157

158158
echo ::group::PIP_LIST
159-
cmd_prefix bash -c "pip3 list && pipdeptree"
159+
cmd_prefix bash -c "pip3 list"
160160
echo ::endgroup::

.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,5 +147,5 @@ jobs:
147147
docker logs pulp || true
148148
docker exec pulp ls -latr /etc/yum.repos.d/ || true
149149
docker exec pulp cat /etc/yum.repos.d/* || true
150-
docker exec pulp bash -c "pip3 list && pip3 install pipdeptree && pipdeptree"
150+
docker exec pulp bash -c "pip3 list" || true
151151
...

0 commit comments

Comments
 (0)