Skip to content

Commit 5377a40

Browse files
committed
deps: drop awscli, install awscli2 on x86_64 only
The package is noarch, but one of its dep isn't available on s390x.[[1]] What's new in Fedora 39 is the AwsCli[[2]] change in which the `awscli` was retired in favour of `awscli2`. In fact, it turns out even on f38 we were pulling in `awscli2` on all arches except s390x, where we still pulled `awscli`. Anyway, cosa itself doesn't use the `aws` CLI but the Python/Go API libraries directly, which *are* available on all arches. The pipeline does use it in one spot[[3]], but that's only ever run from the Jenkins controller, which is x86_64. So let's just move the dep to be x86_64-specific and make it clear it's not for cosa itself but for the pipeline and developer convenience. [1]: https://src.fedoraproject.org/rpms/awscli2/blob/62f260a00a87/f/awscli2.spec#_41 [2]: https://fedoraproject.org/wiki/Changes/AwsCli [3]: https://github.com/coreos/fedora-coreos-pipeline/blob/b2dc3c8a1c02e3838b933e09ed6bfc8d8dfe9153/utils.groovy#L214
1 parent e578133 commit 5377a40

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/deps-x86_64.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
# For generating ISO images
22
syslinux-nonlinux
3+
4+
# For the pipeline and developers to interact with AWS. It's not needed by cosa
5+
# itself. This isn't available on s390x at least, so make it x86_64-only.
6+
awscli2

src/deps.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ podman buildah skopeo
4040
jq
4141

4242
# For interacting with AWS/Aliyun/HTTP
43-
awscli golang-github-aliyun-cli python3-boto3 python3-requests
43+
golang-github-aliyun-cli python3-boto3 python3-requests
4444

4545
# For python retries
4646
python3-tenacity

0 commit comments

Comments
 (0)