Skip to content

Commit 3ef34c1

Browse files
committed
Fix azure ci being flakey for restarting nginx
Instead of restarting a service in the container, put the proper configuration in place when generating the image.
1 parent da489c5 commit 3ef34c1

File tree

4 files changed

+9
-12
lines changed

4 files changed

+9
-12
lines changed

.ci/ansible/Containerfile.j2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ FROM {{ ci_base | default(pulp_default_container) }}
55
ADD ./{{ item.name }} ./{{ item.name }}
66
{% endfor %}
77

8-
# Install python packages
9-
# S3 botocore needs to be patched to handle responses from minio during 0-byte uploads
10-
# Hacking botocore (https://github.com/boto/botocore/pull/1990)
8+
{% for item in extra_files | default([]) %}
9+
ADD ./{{ item.origin }} {{ item.destination }}
10+
{% endfor %}
1111

1212
# This MUST be the ONLY call to pip install in inside the container.
1313
RUN pip3 install --upgrade pip setuptools wheel && \

.github/workflows/scripts/install.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ VARSYAML
6262
fi
6363

6464
cat >> vars/main.yaml << VARSYAML
65+
extra_files:
66+
- origin: "pulpcore/pulpcore/tests/functional/assets/api_root_rewrite.conf"
67+
destination: "/etc/nginx/pulp/api_root_rewrite.conf"
6568
services:
6669
- name: pulp
6770
image: "pulp:ci_build"

.github/workflows/scripts/pre_before_script.sh

Lines changed: 0 additions & 9 deletions
This file was deleted.

template_config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ deploy_to_pypi: true
2121
disabled_redis_runners:
2222
- s3
2323
docker_fixtures: true
24+
extra_files:
25+
- origin: pulpcore/pulpcore/tests/functional/assets/api_root_rewrite.conf
26+
destination: /etc/nginx/pulp/api_root_rewrite.conf
2427
flake8: true
2528
flake8_ignore:
2629
- ./pulpcore/app/protobuf/*

0 commit comments

Comments
 (0)