Skip to content

Commit d62101a

Browse files
committed
Temporarily pin the pulp-web version in CI samples
pulp-oci-image repo has been updated and we are currently missing the amd64 architecture for pulp-web image in Quay. As a workaround, this commit pins to an older image that still supports amd64. It also updates the check for docker installation in CI because the ubuntu 24.04 (GH runner) does not come with the daemon.json file by default. [noissue]
1 parent 2006d36 commit d62101a

File tree

10 files changed

+23
-15
lines changed

10 files changed

+23
-15
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ jobs:
206206
shell: bash
207207
- name: Updating registries configuration
208208
run: |
209-
if [ -f "/etc/docker/daemon.json" ]
209+
if [ -f "/etc/docker/daemon.json" ] || sudo systemctl is-active --quiet docker
210210
then
211211
echo "INFO:
212212
Updating docker configuration
@@ -294,7 +294,7 @@ jobs:
294294
shell: bash
295295
- name: Updating registries configuration
296296
run: |
297-
if [ -f "/etc/docker/daemon.json" ]
297+
if [ -f "/etc/docker/daemon.json" ] || sudo systemctl is-active --quiet docker
298298
then
299299
echo "INFO:
300300
Updating docker configuration
@@ -399,7 +399,7 @@ jobs:
399399
shell: bash
400400
- name: Updating registries configuration
401401
run: |
402-
if [ -f "/etc/docker/daemon.json" ]
402+
if [ -f "/etc/docker/daemon.json" ] || sudo systemctl is-active --quiet docker
403403
then
404404
echo "INFO:
405405
Updating docker configuration
@@ -643,7 +643,7 @@ jobs:
643643
shell: bash
644644
- name: Updating registries configuration
645645
run: |
646-
if [ -f "/etc/docker/daemon.json" ]
646+
if [ -f "/etc/docker/daemon.json" ] || sudo systemctl is-active --quiet docker
647647
then
648648
echo "INFO:
649649
Updating docker configuration

.github/workflows/k8s_versions.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
shell: bash
4242
- name: Updating registries configuration
4343
run: |
44-
if [ -f "/etc/docker/daemon.json" ]
44+
if [ -f "/etc/docker/daemon.json" ] || sudo systemctl is-active --quiet docker
4545
then
4646
echo "INFO:
4747
Updating docker configuration
@@ -139,7 +139,7 @@ jobs:
139139
shell: bash
140140
- name: Updating registries configuration
141141
run: |
142-
if [ -f "/etc/docker/daemon.json" ]
142+
if [ -f "/etc/docker/daemon.json" ] || sudo systemctl is-active --quiet docker
143143
then
144144
echo "INFO:
145145
Updating docker configuration
@@ -239,7 +239,7 @@ jobs:
239239
shell: bash
240240
- name: Updating registries configuration
241241
run: |
242-
if [ -f "/etc/docker/daemon.json" ]
242+
if [ -f "/etc/docker/daemon.json" ] || sudo systemctl is-active --quiet docker
243243
then
244244
echo "INFO:
245245
Updating docker configuration

config/samples/k8s_versions_ci.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ metadata:
44
name: example-pulp
55
spec:
66
image_version: stable
7-
image_web_version: stable
7+
image_web_version: 3.63.4
8+
inhibit_version_constraint: true
89

910
api:
1011
replicas: 1

config/samples/ldap.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ metadata:
1818
spec:
1919
image: localhost/pulp-minimal
2020
image_version: stable
21-
image_web_version: stable
21+
image_web_version: 3.63.4
22+
inhibit_version_constraint: true
2223
ldap:
2324
config: pulp-ldap-secret
2425
api:

config/samples/simple-external-db.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ spec:
2121
external_db_secret: external-database
2222

2323
image_version: stable
24-
image_web_version: stable
24+
image_web_version: 3.63.4
25+
inhibit_version_constraint: true
2526
api:
2627
replicas: 1
2728
content:

config/samples/simple-test.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ spec:
77
enabled: true
88
deployment_type: pulp
99
image_version: stable
10-
image_web_version: stable
10+
image_web_version: 3.63.4
11+
inhibit_version_constraint: true
1112
api:
1213
replicas: 1
1314
content:

config/samples/simple-with-reduced-migration-cpu.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ spec:
77
enabled: true
88
deployment_type: pulp
99
image_version: stable
10-
image_web_version: stable
10+
image_web_version: 3.63.4
11+
inhibit_version_constraint: true
1112
api:
1213
replicas: 1
1314
content:

config/samples/simple.ingress.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ metadata:
55
spec:
66
deployment_type: pulp
77
image_version: stable
8-
image_web_version: stable
8+
image_web_version: 3.63.4
9+
inhibit_version_constraint: true
910
# affinity:
1011
# nodeAffinity:
1112
# requiredDuringSchedulingIgnoredDuringExecution:

config/samples/simple.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ metadata:
55
spec:
66
deployment_type: pulp
77
image_version: stable
8-
image_web_version: stable
8+
image_web_version: 3.63.4
9+
inhibit_version_constraint: true
910
# affinity:
1011
# nodeAffinity:
1112
# requiredDuringSchedulingIgnoredDuringExecution:

config/samples/telemetry.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ spec:
66
telemetry:
77
enabled: true
88
image_version: stable
9-
image_web_version: stable
9+
image_web_version: 3.63.4
10+
inhibit_version_constraint: true
1011
api:
1112
replicas: 1
1213
content:

0 commit comments

Comments
 (0)