Skip to content

Commit 8d6f633

Browse files
More fedora sd cmd fixes (#26)
* Update screwdriver.yaml * Update pypirun.sh
1 parent d311c4d commit 8d6f633

File tree

2 files changed

+18
-9
lines changed

2 files changed

+18
-9
lines changed

screwdriver.yaml

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,20 +71,29 @@ jobs:
7171
- testpypirun: sd-cmd python/pypirun@pre serviceping serviceping -c 1 yahoo.com
7272
requires: [publish_sd_cmd]
7373

74-
test_sd_cmd_ubuntu:
75-
image: ubuntu
74+
test_sd_cmd_manylinux2014:
75+
image: quay.io/pypa/manylinux2014_x86_64
7676
steps:
7777
- testpypirun: sd-cmd python/pypirun@pre serviceping serviceping -c 1 yahoo.com
7878
requires: [publish_sd_cmd]
79+
80+
# These containers seem to hang before the CI jobs start
81+
# test_sd_cmd_ubuntu:
82+
# image: ubuntu
83+
# steps:
84+
# - testpypirun: sd-cmd python/pypirun@pre serviceping serviceping -c 1 yahoo.com
85+
# requires: [publish_sd_cmd]
7986

80-
test_sd_cmd_alpine:
81-
image: alpine
82-
steps:
83-
- testpypirun: sd-cmd python/pypirun@pre serviceping serviceping -c 1 yahoo.com
84-
requires: [publish_sd_cmd]
87+
# test_sd_cmd_alpine:
88+
# image: alpine
89+
# steps:
90+
# - testpypirun: sd-cmd python/pypirun@pre serviceping serviceping -c 1 yahoo.com
91+
# requires: [publish_sd_cmd]
8592

8693
promote_sd_cmd:
8794
image: quay.io/pypa/manylinux2010_x86_64
8895
steps:
8996
- promote: sd-cmd promote python/pypirun latest stable
90-
requires: [test_sd_cmd_fedora, test_sd_cmd_manylinux2010, test_sd_cmd_ubuntu, test_sd_cmd_alpine]
97+
requires: [test_sd_cmd_fedora, test_sd_cmd_manylinux2010, test_sd_cmd_manylinux2014,
98+
# test_sd_cmd_ubuntu, test_sd_cmd_alpine
99+
]

sd-cmd/pypirun.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,4 @@ function ensure_venv_works {
7575
install_python
7676
ensure_venv_works
7777
install_pyrun
78-
pypirun $@
78+
python3 -m pypirun $@

0 commit comments

Comments
 (0)