Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove midstream infra related to the resources.tgz file that was removed upstream. #647

Open
wants to merge 2 commits into
base: devspaces-3.17-rhel-8
Choose a base branch
from
Open

Remove midstream infra related to the resources.tgz file that was removed upstream. #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea8caf9
Remove midstream infra related to the resources.tgz file that was rem…
SDawley Oct 9, 2024
92a69ba
Removing other unneeded files for the resources.tgx and ovsx.tar.gz
SDawley Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 0 additions & 37 deletions devspaces-pluginregistry/bootstrap.Dockerfile
View file
Open in desktop

This file was deleted.

251 changes: 0 additions & 251 deletions devspaces-pluginregistry/build.sh
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions devspaces-pluginregistry/build/dockerfiles/ovsx-installer.Dockerfile
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions devspaces-pluginregistry/build/dockerfiles/rhel.cache_artifacts.sh
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions devspaces-pluginregistry/get-sources.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,20 +72,6 @@ if [[ ${PULL_ASSETS} -eq 1 ]]; then
# TODO replace this with cachito
#

# transform Brew friendly bootstrap.Dockerfile so we can use it in Jenkins where base images need full registry path
sed bootstrap.Dockerfile -i --regexp-extended \
`# replace org/container:tag with reg-proxy/rh-osbs/org-container:tag` \
-e "s#^FROM ([^/:]+)/([^/:]+):([^/:]+)#FROM registry-proxy.engineering.redhat.com/rh-osbs/\1-\2:\3#" \
`# replace ubi8-minimal:tag with reg-proxy/rh-osbs/ubi-minimal:tag` \
-e "s#^FROM ([^/:]+):([^/:]+)#FROM registry-proxy.engineering.redhat.com/rh-osbs/\1:\2#"
echo "======= BOOTSTRAP DOCKERFILE =======>"
cat bootstrap.Dockerfile
echo "<======= BOOTSTRAP DOCKERFILE ======="
echo "======= START BOOTSTRAP BUILD =======>"
${BUILDER} build -t ${tmpContainer} . --no-cache -f bootstrap.Dockerfile \
--target builder --build-arg BOOTSTRAP=true
echo "<======= END BOOTSTRAP BUILD ======="

# update tarballs - step 2 - check old sources' tarballs
git rm -f *.tar.gz *.tgz 2>/dev/null || rm -f *.tar.gz *.tgz || true
rhpkg sources || true
Expand Down Expand Up @@ -117,15 +103,6 @@ if [[ ${PULL_ASSETS} -eq 1 ]]; then
fi
sudo rm -fr ${tmpDir}

# we always need a fresh resources.tgz to guarantee proper timestamps and latest vsix files
rm -f ./resources.tgz || true
${BUILDER} create --name pluginregistryBuilder ${tmpContainer}
${BUILDER} cp pluginregistryBuilder:/tmp/resources/resources.tgz .
${BUILDER} rm -f pluginregistryBuilder
${BUILDER} rmi ${tmpContainer}
# add to TARGZs list
TARGZs="${TARGZs} resources.tgz"

SCRIPT_BRANCH="$(git rev-parse --abbrev-ref HEAD 2>/dev/null || true)"
if [[ $SCRIPT_BRANCH != "devspaces-3."*"-rhel-8" ]]; then
SCRIPT_BRANCH="devspaces-3-rhel-8"
Expand Down
3 changes: 1 addition & 2 deletions devspaces-pluginregistry/sources
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
SHA512 (root-local.tgz) = e279552956981f63d2d2d1a93e0dbc3266bd36c19ff8c52d4d9c69d5b3c27f1f73614a9535a38c8cecb05dc2de6a527637610074ebc60bc04591b97b50726ed9
SHA512 (resources.tgz) = 0a5ff9824c7ad5063927bd0f33d3550b4d6fad663887b1ea69087d153c0a3b375715ef84df765f9a57ac26288365995edab879344fe8fe24c7d853c89b712bb0
SHA512 (openvsx-server.tar.gz) = fa648461eea01e97a6718adc32a96d10a5a0443695f269bb5f497bb84d7f62a5ef9484b5f8e00ca0ee61456620053659a22131d9a695d8a2dc4c773b82a0af4d
SHA512 (ovsx.tar.gz) = 496595dcc0f1902af5296d03e2e297399ea85d669bae0be5e767d1cec81728288a7b4f9689ec9d4e7d88b182cc792eb850cb00145ce033342ca3ec28dfb967d8

4 changes: 1 addition & 3 deletions devspaces-pluginregistry/sources.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,4 @@ This is a dirty hack for https://issues.redhat.com/browse/CRW-4328 and https://p

# workaround for https://issues.redhat.com/browse/CRW-4378 - must list all the files already in the sources file, because reasons.
Source001: root-local.tgz
Source002: resources.tgz
Source003: openvsx-server.tar.gz
Source004: ovsx.tar.gz
Source002: openvsx-server.tar.gz