diff --git a/test/extended/builds/build_pruning.go b/test/extended/builds/build_pruning.go index 8280b1b6aded..d5a9d3b4366d 100644 --- a/test/extended/builds/build_pruning.go +++ b/test/extended/builds/build_pruning.go @@ -39,14 +39,9 @@ var _ = g.Describe("[sig-builds][Feature:Builds] prune builds based on settings }) g.JustBeforeEach(func() { - g.By("waiting for openshift namespace imagestreams") - err := exutil.WaitForOpenShiftNamespaceImageStreams(oc) - o.Expect(err).NotTo(o.HaveOccurred()) - g.By("creating test image stream") - err = oc.Run("create").Args("-f", isFixture).Execute() + err := oc.Run("create").Args("-f", isFixture).Execute() o.Expect(err).NotTo(o.HaveOccurred()) - }) g.AfterEach(func() { diff --git a/test/extended/builds/clone_git_protocol.go b/test/extended/builds/clone_git_protocol.go index d3b0137f850f..0e3a668ae06b 100644 --- a/test/extended/builds/clone_git_protocol.go +++ b/test/extended/builds/clone_git_protocol.go @@ -18,13 +18,6 @@ var _ = g.Describe("[sig-builds][Feature:Builds] clone repository using git:// p exutil.PreTestDump() }) - g.JustBeforeEach(func() { - g.By("waiting for openshift namespace imagestreams") - err := exutil.WaitForOpenShiftNamespaceImageStreams(oc) - o.Expect(err).NotTo(o.HaveOccurred()) - - }) - g.AfterEach(func() { if g.CurrentGinkgoTestDescription().Failed { exutil.DumpPodStates(oc) @@ -32,9 +25,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds] clone repository using git:// p exutil.DumpPodLogsStartingWith("", oc) } }) - g.It("should clone using git:// if no proxy is configured", func() { - if true { // TODO: g.Skip("test disabled due to https://bugzilla.redhat.com/show_bug.cgi?id=2019433 and https://github.blog/2021-09-01-improving-git-protocol-security-github/#git-protocol-troubleshooting: 'The unauthenticated git protocol on port 9418 is no longer supported'") @@ -48,7 +39,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds] clone repository using git:// p } g.By("creating a new application using the git:// protocol") - err = oc.Run("new-app").Args("git://github.com/sclorg/ruby-ex.git").Execute() + err = oc.Run("new-app").Args("registry.redhat.io/ubi8/ruby-30:latest~git://github.com/sclorg/ruby-ex.git").Execute() o.Expect(err).NotTo(o.HaveOccurred()) }) }) diff --git a/test/extended/builds/new_app.go b/test/extended/builds/new_app.go index 0b959ccd7a58..6ccf81561bec 100644 --- a/test/extended/builds/new_app.go +++ b/test/extended/builds/new_app.go @@ -56,7 +56,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds] oc new-app", func() { g.It("should succeed with a --name of 58 characters", func() { g.By("calling oc new-app") - err := oc.Run("new-app").Args("https://github.com/sclorg/nodejs-ex", "--name", a58, "--build-env=BUILD_LOGLEVEL=5").Execute() + err := oc.Run("new-app").Args("registry.redhat.io/ubi8/nodejs-16:latest~https://github.com/sclorg/nodejs-ex", "--name", a58, "--build-env=BUILD_LOGLEVEL=5").Execute() o.Expect(err).NotTo(o.HaveOccurred()) g.By("waiting for the build to complete") @@ -83,7 +83,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds] oc new-app", func() { g.It("should fail with a --name longer than 58 characters", func() { g.By("calling oc new-app") - out, err := oc.Run("new-app").Args("https://github.com/sclorg/nodejs-ex", "--name", a59).Output() + out, err := oc.Run("new-app").Args("registry.redhat.io/ubi8/nodejs-16:latest~https://github.com/sclorg/nodejs-ex", "--name", a59).Output() o.Expect(err).To(o.HaveOccurred()) o.Expect(out).To(o.ContainSubstring("error: invalid name: ")) }) @@ -91,7 +91,10 @@ var _ = g.Describe("[sig-builds][Feature:Builds] oc new-app", func() { g.It("should succeed with an imagestream", func() { // Bug 1767163 - oc new-app with --image-stream produced invalid labels g.By("calling oc new-app with imagestream") - out, err := oc.Run("new-app").Args("https://github.com/sclorg/nodejs-ex", "--image-stream=nodejs:latest").Output() + // Note: the imagestream used here does not matter (does not have to a valid builder) since we are not checking + // the output results. Since we can't rely on the samples operator being present to install sample s2i-enabled + // imagestreams, just use one of the static imagestreams instead (cli:latest) + out, err := oc.Run("new-app").Args("https://github.com/sclorg/nodejs-ex", "--image-stream=cli:latest").Output() o.Expect(err).NotTo(o.HaveOccurred()) o.Expect(out).NotTo(o.ContainSubstring("error:")) }) diff --git a/test/extended/builds/service.go b/test/extended/builds/service.go index ee0e167fa58f..08671b44ca1e 100644 --- a/test/extended/builds/service.go +++ b/test/extended/builds/service.go @@ -43,7 +43,7 @@ RUN curl -vvv hello-nodejs:8080 g.Describe("with a build being created from new-build", func() { g.It("should be able to run a build that references a cluster service", func() { g.By("standing up a new hello world nodejs service via oc new-app") - err := oc.Run("new-app").Args("nodejs~https://github.com/sclorg/nodejs-ex.git", "--name", "hello-nodejs").Execute() + err := oc.Run("new-app").Args("registry.redhat.io/ubi8/nodejs-16:latest~https://github.com/sclorg/nodejs-ex.git", "--name", "hello-nodejs").Execute() o.Expect(err).NotTo(o.HaveOccurred()) err = exutil.WaitForABuild(oc.BuildClient().BuildV1().Builds(oc.Namespace()), "hello-nodejs-1", nil, nil, nil) diff --git a/test/extended/builds/valuefrom.go b/test/extended/builds/valuefrom.go index 097513cb8cd4..56ba25594fd4 100644 --- a/test/extended/builds/valuefrom.go +++ b/test/extended/builds/valuefrom.go @@ -37,12 +37,8 @@ var _ = g.Describe("[sig-builds][Feature:Builds][valueFrom] process valueFrom in }) g.JustBeforeEach(func() { - g.By("waiting for openshift namespace imagestreams") - err := exutil.WaitForOpenShiftNamespaceImageStreams(oc) - o.Expect(err).NotTo(o.HaveOccurred()) - g.By("creating test image stream") - err = oc.Run("create").Args("-f", testImageStreamFixture, "--validate=false").Execute() + err := oc.Run("create").Args("-f", testImageStreamFixture, "--validate=false").Execute() o.Expect(err).NotTo(o.HaveOccurred()) g.By("creating test secret") diff --git a/test/extended/testdata/bindata.go b/test/extended/testdata/bindata.go index 594d3e514b50..8f02c155c5f3 100644 --- a/test/extended/testdata/bindata.go +++ b/test/extended/testdata/bindata.go @@ -17304,9 +17304,8 @@ spec: type: Source sourceStrategy: from: - kind: ImageStreamTag - namespace: openshift - name: 'php:7.4-ubi8' + kind: DockerImage + name: registry.redhat.io/ubi8/php-74:latest `) func testExtendedTestdataBuildsBuildPruningDefaultGroupBuildConfigYamlBytes() ([]byte, error) { @@ -17324,31 +17323,21 @@ func testExtendedTestdataBuildsBuildPruningDefaultGroupBuildConfigYaml() (*asset return a, nil } -var _testExtendedTestdataBuildsBuildPruningDefaultLegacyBuildConfigYaml = []byte(`{ - "apiVersion": "v1", - "kind": "BuildConfig", - "metadata": { - "name": "myphp" - }, - "spec": { - "source": { - "type": "Git", - "git": { - "uri": "https://github.com/sclorg/cakephp-ex.git" - } - }, - "strategy": { - "type": "Source", - "sourceStrategy": { - "from": { - "kind": "ImageStreamTag", - "namespace": "openshift", - "name": "php:7.4-ubi8" - } - } - } - } -} +var _testExtendedTestdataBuildsBuildPruningDefaultLegacyBuildConfigYaml = []byte(`apiVersion: v1 +kind: BuildConfig +metadata: + name: myphp +spec: + source: + type: Git + git: + uri: https://github.com/sclorg/cakephp-ex.git + strategy: + type: Source + sourceStrategy: + from: + kind: DockerImage + name: registry.redhat.io/ubi8/php-74:latest `) func testExtendedTestdataBuildsBuildPruningDefaultLegacyBuildConfigYamlBytes() ([]byte, error) { @@ -17386,9 +17375,8 @@ spec: fieldRef: fieldPath: metadata.nofield from: - kind: ImageStreamTag - namespace: openshift - name: 'php:7.4-ubi8' + kind: DockerImage + name: registry.redhat.io/ubi8/php-74:latest `) func testExtendedTestdataBuildsBuildPruningErroredBuildConfigYamlBytes() ([]byte, error) { @@ -17424,9 +17412,8 @@ spec: type: Source sourceStrategy: from: - kind: ImageStreamTag - namespace: openshift - name: 'php:7.4-ubi8' + kind: DockerImage + name: registry.redhat.io/ubi8/php-74:latest `) func testExtendedTestdataBuildsBuildPruningFailedBuildConfigYamlBytes() ([]byte, error) { @@ -29589,7 +29576,7 @@ os::cmd::try_until_success 'oc rollout history dc/database --revision=2' # rolling back to the same revision should fail os::cmd::expect_failure 'oc rollback dc/database --to-version=2' # undo --dry-run should report the original image -os::cmd::expect_success_and_text 'oc rollout undo dc/database --dry-run' 'image-registry.openshift-image-registry.svc:5000/openshift/mysql:8.0-el8' +os::cmd::expect_success_and_text 'oc rollout undo dc/database --dry-run' 'registry.redhat.io/rhel8/mysql-80:latest' echo "rollback: ok" os::test::junit::declare_suite_end @@ -33625,7 +33612,7 @@ var _testExtendedTestdataCmdTestCmdTestdataApplicationTemplateDockerbuildJson = { "from": { "kind": "DockerImage", - "name": "image-registry.openshift-image-registry.svc:5000/openshift/ruby:latest" + "name": "registry.redhat.io/ubi8/ruby-30:latest" }, "name": "latest" } @@ -33889,7 +33876,7 @@ var _testExtendedTestdataCmdTestCmdTestdataApplicationTemplateDockerbuildJson = "containers": [ { "name": "ruby-helloworld-database", - "image": "image-registry.openshift-image-registry.svc:5000/openshift/mysql:8.0-el8", + "image": "registry.redhat.io/rhel8/mysql-80:latest", "ports": [ { "containerPort": 3306, diff --git a/test/extended/testdata/builds/build-pruning/default-group-build-config.yaml b/test/extended/testdata/builds/build-pruning/default-group-build-config.yaml index 9237594cb493..e27a701f1dc7 100644 --- a/test/extended/testdata/builds/build-pruning/default-group-build-config.yaml +++ b/test/extended/testdata/builds/build-pruning/default-group-build-config.yaml @@ -11,6 +11,5 @@ spec: type: Source sourceStrategy: from: - kind: ImageStreamTag - namespace: openshift - name: 'php:7.4-ubi8' + kind: DockerImage + name: registry.redhat.io/ubi8/php-74:latest diff --git a/test/extended/testdata/builds/build-pruning/default-legacy-build-config.yaml b/test/extended/testdata/builds/build-pruning/default-legacy-build-config.yaml index 450940e734e0..6f9af27e7dba 100644 --- a/test/extended/testdata/builds/build-pruning/default-legacy-build-config.yaml +++ b/test/extended/testdata/builds/build-pruning/default-legacy-build-config.yaml @@ -1,25 +1,15 @@ -{ - "apiVersion": "v1", - "kind": "BuildConfig", - "metadata": { - "name": "myphp" - }, - "spec": { - "source": { - "type": "Git", - "git": { - "uri": "https://github.com/sclorg/cakephp-ex.git" - } - }, - "strategy": { - "type": "Source", - "sourceStrategy": { - "from": { - "kind": "ImageStreamTag", - "namespace": "openshift", - "name": "php:7.4-ubi8" - } - } - } - } -} +apiVersion: v1 +kind: BuildConfig +metadata: + name: myphp +spec: + source: + type: Git + git: + uri: https://github.com/sclorg/cakephp-ex.git + strategy: + type: Source + sourceStrategy: + from: + kind: DockerImage + name: registry.redhat.io/ubi8/php-74:latest diff --git a/test/extended/testdata/builds/build-pruning/errored-build-config.yaml b/test/extended/testdata/builds/build-pruning/errored-build-config.yaml index 1d6b0ab50bc4..c06ea5bd9fe8 100644 --- a/test/extended/testdata/builds/build-pruning/errored-build-config.yaml +++ b/test/extended/testdata/builds/build-pruning/errored-build-config.yaml @@ -18,6 +18,5 @@ spec: fieldRef: fieldPath: metadata.nofield from: - kind: ImageStreamTag - namespace: openshift - name: 'php:7.4-ubi8' + kind: DockerImage + name: registry.redhat.io/ubi8/php-74:latest diff --git a/test/extended/testdata/builds/build-pruning/failed-build-config.yaml b/test/extended/testdata/builds/build-pruning/failed-build-config.yaml index f247e0810fee..2f98df27f2ea 100644 --- a/test/extended/testdata/builds/build-pruning/failed-build-config.yaml +++ b/test/extended/testdata/builds/build-pruning/failed-build-config.yaml @@ -16,6 +16,5 @@ spec: type: Source sourceStrategy: from: - kind: ImageStreamTag - namespace: openshift - name: 'php:7.4-ubi8' + kind: DockerImage + name: registry.redhat.io/ubi8/php-74:latest diff --git a/test/extended/testdata/cmd/test/cmd/deployments.sh b/test/extended/testdata/cmd/test/cmd/deployments.sh index 83f1b721600c..83a0d26ea21c 100755 --- a/test/extended/testdata/cmd/test/cmd/deployments.sh +++ b/test/extended/testdata/cmd/test/cmd/deployments.sh @@ -122,7 +122,7 @@ os::cmd::try_until_success 'oc rollout history dc/database --revision=2' # rolling back to the same revision should fail os::cmd::expect_failure 'oc rollback dc/database --to-version=2' # undo --dry-run should report the original image -os::cmd::expect_success_and_text 'oc rollout undo dc/database --dry-run' 'image-registry.openshift-image-registry.svc:5000/openshift/mysql:8.0-el8' +os::cmd::expect_success_and_text 'oc rollout undo dc/database --dry-run' 'registry.redhat.io/rhel8/mysql-80:latest' echo "rollback: ok" os::test::junit::declare_suite_end diff --git a/test/extended/testdata/cmd/test/cmd/testdata/application-template-dockerbuild.json b/test/extended/testdata/cmd/test/cmd/testdata/application-template-dockerbuild.json index 14c9b02ecd3a..fe5c82eec192 100644 --- a/test/extended/testdata/cmd/test/cmd/testdata/application-template-dockerbuild.json +++ b/test/extended/testdata/cmd/test/cmd/testdata/application-template-dockerbuild.json @@ -90,7 +90,7 @@ { "from": { "kind": "DockerImage", - "name": "image-registry.openshift-image-registry.svc:5000/openshift/ruby:latest" + "name": "registry.redhat.io/ubi8/ruby-30:latest" }, "name": "latest" } @@ -354,7 +354,7 @@ "containers": [ { "name": "ruby-helloworld-database", - "image": "image-registry.openshift-image-registry.svc:5000/openshift/mysql:8.0-el8", + "image": "registry.redhat.io/rhel8/mysql-80:latest", "ports": [ { "containerPort": 3306,