Skip to content

Commit

Permalink
ci: Drop skopeo override
Browse files Browse the repository at this point in the history
It's actively downgrading things now.
  • Loading branch information
cgwalters committed Mar 23, 2022
1 parent 02f4cff commit 6b1110a
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 4 deletions.
1 change: 0 additions & 1 deletion .cci.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ parallel insttests: {
# include our built rpm-ostree in the image
mkdir -p overrides/rpm
mv *.rpm overrides/rpm
${env.WORKSPACE}/ci/cosa-overrides.sh
coreos-assembler fetch
coreos-assembler build
${env.WORKSPACE}/ci/composepost-checks.sh
Expand Down
2 changes: 0 additions & 2 deletions ci/cosa-overrides.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,3 @@
# Inject ideally temporary overrides into our cosa build
# skopeo for containers https://github.com/containers/skopeo/pull/1476
cd overrides/rpm
curl -L --remote-name-all \
https://kojipkgs.fedoraproject.org//packages/skopeo/1.5.1/1.fc35/x86_64/skopeo-1.5.1-1.fc35.x86_64.rpm
1 change: 0 additions & 1 deletion ci/prow/fcos-e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ rpm-ostree --version
cd $(mktemp -d)
cosa init https://github.com/coreos/fedora-coreos-config/
rsync -rlv /cosa/component-install/ overrides/rootfs/
/ci/cosa-overrides.sh
cosa fetch
cosa build
cosa kola run 'ext.rpm-ostree.*'

0 comments on commit 6b1110a

Please sign in to comment.