Skip to content

Commit 0864598

Browse files
committed
Revert "Save a list of images used by e2e.test"
This reverts commit a3c4a60.
1 parent 83e6636 commit 0864598

File tree

4 files changed

+5
-97
lines changed

4 files changed

+5
-97
lines changed

hack/update-conformance-yaml.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,3 @@ cd "${KUBE_ROOT}"
2525
test/conformance/gen-conformance-yaml.sh
2626
# replace checked-in yaml
2727
cp _output/conformance.yaml test/conformance/testdata/conformance.yaml
28-
29-
# generate list of images
30-
test/conformance/gen-test-image-list.sh
31-
# replace checked-in list of images
32-
cp _output/repo_list_images.txt test/conformance/testdata/repo_list_images.txt

hack/verify-conformance-yaml.sh

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,9 @@ cd "${KUBE_ROOT}"
2525
test/conformance/gen-conformance-yaml.sh
2626

2727
# diff generated and checked-in
28-
if ! diff -u test/conformance/testdata/conformance.yaml _output/conformance.yaml; then
29-
echo FAIL
30-
echo 'See instructions in test/conformance/README.md'
31-
exit 1
28+
if diff -u test/conformance/testdata/conformance.yaml _output/conformance.yaml; then
29+
echo PASS
30+
exit 0
3231
fi
33-
34-
# generate image list
35-
test/conformance/gen-test-image-list.sh
36-
37-
# diff generated and checked-in
38-
if ! diff -u test/conformance/testdata/repo_list_images.txt _output/repo_list_images.txt; then
39-
echo FAIL
40-
exit 1
41-
fi
42-
exit 0
32+
echo 'See instructions in test/conformance/README.md'
33+
exit 1

test/conformance/gen-test-image-list.sh

Lines changed: 0 additions & 26 deletions
This file was deleted.

test/conformance/testdata/repo_list_images.txt

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)