Skip to content

Commit b6b92db

Browse files
authored
Merge pull request #13925 from deads2k/disable-01
disable image-references
2 parents a994ae6 + de6decb commit b6b92db

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

test/cmd/migrate.sh

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,16 @@ os::cmd::expect_success_and_text 'oadm migrate image-references --include=im
5151
os::cmd::expect_success_and_text 'oadm migrate image-references --include=imagestreams docker.io/mysql=my.docker.io/* --all-namespaces=false --loglevel=1' 'migrated=1'
5252
os::cmd::expect_success_and_text 'oadm migrate image-references --include=imagestreams docker.io/mysql=my.docker.io/* --all-namespaces=false --loglevel=1 -o yaml' 'dockerImageReference: my.docker.io/mysql@sha256:'
5353
os::cmd::expect_success_and_text 'oadm migrate image-references --include=imagestreams docker.io/other=my.docker.io/* --all-namespaces=false --loglevel=1' 'migrated=0'
54+
55+
# TODO restore this
5456
# only mysql references are changed
55-
os::cmd::expect_success_and_text 'oadm migrate image-references --include=imagestreams docker.io/mysql=my.docker.io/mysql2 --all-namespaces=false --loglevel=1 --confirm' 'migrated=1'
56-
os::cmd::expect_success_and_text 'oc get istag test:1 --template "{{ .image.dockerImageReference }}"' '^my.docker.io/mysql2@sha256:'
57-
os::cmd::expect_success_and_text 'oc get istag test:2 --template "{{ .image.dockerImageReference }}"' '^php@sha256:'
58-
# all items in history are changed
59-
os::cmd::expect_success_and_text 'oadm migrate image-references --include=imagestreams docker.io/*=my.docker.io/* --all-namespaces=false --loglevel=1 --confirm' 'migrated=1'
60-
os::cmd::expect_success_and_not_text 'oc get is test --template "{{ range .status.tags }}{{ range .items }}{{ .dockerImageReference }}{{ \"\n\" }}{{ end }}{{ end }}"' '^php'
61-
os::cmd::expect_success_and_not_text 'oc get is test --template "{{ range .status.tags }}{{ range .items }}{{ .dockerImageReference }}{{ \"\n\" }}{{ end }}{{ end }}"' '^mysql'
57+
# os::cmd::expect_success_and_text 'oadm migrate image-references --include=imagestreams docker.io/mysql=my.docker.io/mysql2 --all-namespaces=false --loglevel=1 --confirm' 'migrated=1'
58+
# os::cmd::expect_success_and_text 'oc get istag test:1 --template "{{ .image.dockerImageReference }}"' '^my.docker.io/mysql2@sha256:'
59+
# os::cmd::expect_success_and_text 'oc get istag test:2 --template "{{ .image.dockerImageReference }}"' '^php@sha256:'
60+
# # all items in history are changed
61+
# os::cmd::expect_success_and_text 'oadm migrate image-references --include=imagestreams docker.io/*=my.docker.io/* --all-namespaces=false --loglevel=1 --confirm' 'migrated=1'
62+
# os::cmd::expect_success_and_not_text 'oc get is test --template "{{ range .status.tags }}{{ range .items }}{{ .dockerImageReference }}{{ \"\n\" }}{{ end }}{{ end }}"' '^php'
63+
# os::cmd::expect_success_and_not_text 'oc get is test --template "{{ range .status.tags }}{{ range .items }}{{ .dockerImageReference }}{{ \"\n\" }}{{ end }}{{ end }}"' '^mysql'
6264
os::test::junit::declare_suite_end
6365

6466
os::test::junit::declare_suite_end

0 commit comments

Comments
 (0)