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

Jump to bottom

Stop pulling in machine-os-content #102

Merged
merged 1 commit into from
Oct 11, 2022
Merged

Stop pulling in machine-os-content #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 1 addition & 6 deletions manifests/01-openshift-imagestream.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,4 @@ spec:
from:
kind: DockerImage
name: example.com/image-reference-placeholder:driver-toolkit
- name: 0.0.1-snapshot-machine-os
importPolicy:
scheduled: true
from:
kind: DockerImage
name: example.com/image-reference-placeholder:driver-toolkit

4 changes: 0 additions & 4 deletions manifests/image-references
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,3 @@ spec:
from:
kind: DockerImage
name: example.com/image-reference-placeholder:driver-toolkit
- name: machine-os-content
from:
kind: DockerImage
name: registry.svc.ci.openshift.org/openshift:machine-os-content
37 changes: 0 additions & 37 deletions test/e2e
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,39 +62,6 @@ test_imagestream() {
oc get imagestream/driver-toolkit -n openshift -o yaml > ${ARTIFACT_DIR}/driver-toolkit-imagestream.yaml
}

# Check for latest and RHCOS tags
test_imagestream_tags() {
rhcos_version=$(get_node_rhcos_version)
echo "INFO: Node RHCOS version: ${rhcos_version}"

oc get imagestream/driver-toolkit -n openshift -o json | jq ".spec.tags[].name"

image_latest=$(oc get imagestream/driver-toolkit -n openshift -o json \
| jq -r ".spec.tags[] | select(.name == \"latest\") | .from.name")
echo "INFO: Image from latest tag: ${image_latest}"

echo "$image_latest" > ${ARTIFACT_DIR}/latest_image.address

image_rhcos_tag=$(oc get imagestream/driver-toolkit -n openshift -o json \
| jq -r ".spec.tags[] | select(.name == \"${rhcos_version}\") | .from.name")
echo "INFO: Image from RHCOS tag: ${image_rhcos_tag}"

if [[ ${image_latest} == "" ]]; then
echo "ERROR: driver-toolkit latest tag is empty string"
exit 1
fi

if [[ ${image_rhcos_tag} == "" ]]; then
echo "ERROR: driver-toolkit RHCOS version tag is empty string"
exit 1
fi

if [[ ${image_rhcos_tag} != ${image_latest} ]]; then
echo "ERROR: driver-toolkit latest and RHCOS version tags mismatch (${image_rhos_tag} != ${image_latest})"
exit 1
fi
}

# Gets the /etc/driver-toolkit-release.json file from driver-toolkit
# Sends the resulting filename to stdout
get_driver_toolkit_release_file(){
Expand Down Expand Up @@ -199,10 +166,6 @@ echo
echo "## TEST: Checking imagestream/driver-toolkit ##"
test_imagestream

echo
echo "## TEST: Checking that driver-toolkit/imagestream latest and RHCOS tag are matching and non-empty ##"
test_imagestream_tags

echo
echo "## TEST: Checking that RHEL version in driver-toolkit matches the node ##"
test_rhel_version
Expand Down