Skip to content

Fix 4096 #18

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

Open
adrianriobo wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix 4096 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9be684e
[qe] Use ubi8 image as builder for qe images
adrianriobo Apr 29, 2024
d2eb3d7
[qe] fix integration image scripts
adrianriobo Apr 29, 2024
c99500c
[qe] change the httpd image used within e2e to registry.access.redhat…
adrianriobo Apr 29, 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
2 changes: 1 addition & 1 deletion images/build-e2e/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

FROM registry.access.redhat.com/ubi9/go-toolset:1.20 AS builder
FROM registry.access.redhat.com/ubi8/go-toolset:1.20 AS builder

USER root

Expand Down
2 changes: 1 addition & 1 deletion images/build-integration/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

FROM registry.access.redhat.com/ubi9/go-toolset:1.20 AS builder
FROM registry.access.redhat.com/ubi8/go-toolset:1.20 AS builder

USER root

Expand Down
8 changes: 4 additions & 4 deletions images/build-integration/lib/darwin/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ done
mkdir -p $targetFolder/results

# Run tests
PATH="$PATH:${HOME}/$targetFolder/bin"
PULL_SECRET_PATH="${HOME}/$targetFolder/pull-secret"
export PATH="$PATH:${HOME}/$targetFolder/bin"
export PULL_SECRET_PATH="${HOME}/$targetFolder/pull-secret"
if [ ! -z "$bundleLocation" ]
then
BUNDLE_PATH="$bundleLocation"
export BUNDLE_PATH="$bundleLocation"
fi
cd $targetFolder/bin
. integration.test > integration.results
./integration.test > integration.results

# Copy results
cd ..
Expand Down
8 changes: 4 additions & 4 deletions images/build-integration/lib/linux/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ done
mkdir -p $targetFolder/results

# Run tests
PATH="$PATH:${HOME}/$targetFolder/bin"
PULL_SECRET_PATH="${HOME}/$targetFolder/pull-secret"
export PATH="$PATH:${HOME}/$targetFolder/bin"
export PULL_SECRET_PATH="${HOME}/$targetFolder/pull-secret"
if [ ! -z "$bundleLocation" ]
then
BUNDLE_PATH="$bundleLocation"
export BUNDLE_PATH="$bundleLocation"
fi
cd $targetFolder/bin
. integration.test > integration.results
./integration.test > integration.results

# Copy results
cd ..
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/features/story_openshift.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Feature: 4 Openshift stories
Given executing "oc new-project testproj" succeeds
# mirror
When executing "oc registry login --insecure=true" succeeds
Then executing "oc image mirror quay.io/centos7/httpd-24-centos7:centos7=default-route-openshift-image-registry.apps-crc.testing/testproj/hello:test --insecure=true --filter-by-os=linux/amd64" succeeds
Then executing "oc image mirror registry.access.redhat.com/ubi8/httpd-24:latest=default-route-openshift-image-registry.apps-crc.testing/testproj/hello:test --insecure=true --filter-by-os=linux/amd64" succeeds
And executing "oc set image-lookup hello" succeeds
# deploy
When executing "oc apply -f hello.yaml" succeeds
Expand All @@ -56,7 +56,7 @@ Feature: 4 Openshift stories
Scenario: Pull image locally, push to registry, deploy
Given podman command is available
And executing "oc new-project testproj" succeeds
When pulling image "quay.io/centos7/httpd-24-centos7:centos7", logging in, and pushing local image to internal registry succeeds
When pulling image "registry.access.redhat.com/ubi8/httpd-24:latest", logging in, and pushing local image to internal registry succeeds
And executing "oc apply -f hello.yaml" succeeds
When executing "oc rollout status deployment hello" succeeds
Then stdout should contain "successfully rolled out"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/testsuite/testsuite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -996,7 +996,7 @@ func PullLoginTagPushImageSucceeds(image string) error {
return err
}

_, err = cmd.RunPodmanExpectSuccess("push", "default-route-openshift-image-registry.apps-crc.testing/testproj/hello:test", "--tls-verify=false")
_, err = cmd.RunPodmanExpectSuccess("push", "default-route-openshift-image-registry.apps-crc.testing/testproj/hello:test", "--remove-signatures", "--tls-verify=false")
if err != nil {
return err
}
Expand Down