Skip to content

Commit e051935

Browse files
committed
inline e2e tests with updated parameters
1 parent cfea747 commit e051935

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

test/e2e/e2e.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ teardown() {
5151
buildrun_name=$(random_name)
5252

5353
# ensure that shp build create does not give an error when a build_name is specified
54-
run shp build create ${build_name} --source-url=url --output-image=image
54+
run shp build create ${build_name} --source-git-url=url --output-image=image
5555
assert_success
5656

5757
# ensure that shp buildrun create does not give an error when a buildrun_name is specified

test/e2e/envvars.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ teardown() {
1919
buildrun_name=$(random_name)
2020

2121
# create a Build with two environment variables
22-
run shp build create ${build_name} --source-url=https://github.com/shipwright-io/sample-go --output-image=my-image --env=VAR_1=build-value-1 --env=VAR_2=build-value-2
22+
run shp build create ${build_name} --source-git-url=https://github.com/shipwright-io/sample-go --output-image=my-image --env=VAR_1=build-value-1 --env=VAR_2=build-value-2
2323
assert_success
2424

2525
# ensure that the build was successfully created

test/e2e/log-follow--follow.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ teardown() {
2121

2222
# creating a golang based build
2323
run shp build create ${build_name} \
24-
--source-url=https://github.com/shipwright-io/sample-go \
24+
--source-git-url=https://github.com/shipwright-io/sample-go \
2525
--source-context-dir=source-build \
2626
--output-image=${output_image}
2727
assert_success

test/e2e/log-follow-F.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ teardown() {
2121

2222
# create a Build with two environment variables
2323
run shp build create ${build_name} \
24-
--source-url=https://github.com/shipwright-io/sample-go \
24+
--source-git-url=https://github.com/shipwright-io/sample-go \
2525
--source-context-dir=source-build \
2626
--output-image=${output_image}
2727
assert_success

test/e2e/output-image-labels-annotations.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ teardown() {
1919
buildrun_name=$(random_name)
2020

2121
# create a Build with a label and an annotation
22-
run shp build create ${build_name} --source-url=https://github.com/shipwright-io/sample-go --output-image=my-image --output-image-label=foo=bar --output-image-annotation=created-by=shipwright
22+
run shp build create ${build_name} --source-git-url=https://github.com/shipwright-io/sample-go --output-image=my-image --output-image-label=foo=bar --output-image-annotation=created-by=shipwright
2323
assert_success
2424

2525
# ensure that the build was successfully created

test/e2e/run-follow.bats

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ teardown() {
2121

2222
# create a Build
2323
run shp build create ${build_name} \
24-
--source-url=https://github.com/shipwright-io/sample-go \
24+
--source-git-url=https://github.com/shipwright-io/sample-go \
2525
--source-context-dir=source-build \
2626
--output-image=${output_image}
2727
assert_success
@@ -53,7 +53,7 @@ teardown() {
5353

5454
# create a Build which will fail
5555
run shp build create ${build_name} \
56-
--source-url=https://github.com/shipwright-io/sample-go \
56+
--source-git-url=https://github.com/shipwright-io/sample-go \
5757
--source-context-dir=source-build \
5858
--output-image=${output_image} \
5959
--strategy-name buildkit

test/e2e/upload.bats

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ function assert_shp_upload_follow_output() {
3939
# change directory (cd) during the build process, so if the directory is not uploaded properly
4040
# the actual build will fail
4141
run shp build create ${build_name} \
42-
--source-url="${source_url}" \
42+
--source-git-url="${source_url}" \
4343
--source-context-dir="source-build" \
4444
--output-image="${output_image}"
4545
assert_success
@@ -82,8 +82,8 @@ function assert_shp_upload_follow_output() {
8282

8383
# Verify that invalid prune options are not accepted
8484
run shp build create ${build_name} \
85-
--source-bundle-image="$(get_output_image source-bundle):latest" \
86-
--source-bundle-prune=Magic
85+
--source-oci-artifact-image="$(get_output_image source-bundle):latest" \
86+
--source-oci-artifact-prune=Magic
8787
assert_failure
8888
assert_output --partial 'invalid argument'
8989

@@ -95,8 +95,8 @@ function assert_shp_upload_follow_output() {
9595
# from the local shp client.
9696
#
9797
run shp build create ${build_name} \
98-
--source-bundle-image="$(get_output_image source-bundle):latest" \
99-
--source-bundle-prune=AfterPull \
98+
--source-oci-artifact-image="$(get_output_image source-bundle):latest" \
99+
--source-oci-artifact-prune=AfterPull \
100100
--source-context-dir="docker-build" \
101101
--dockerfile=Dockerfile \
102102
--strategy-name=kaniko \

0 commit comments

Comments
 (0)