This is an automated email from the ASF dual-hosted git repository.
houston pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr-operator.git
The following commit(s) were added to refs/heads/main by this push:
new 62a009a Smoketest fixes.
62a009a is described below
commit 62a009a0d9cdb34215766ca155b0dd5e94850261
Author: Houston Putman <[email protected]>
AuthorDate: Tue Sep 7 10:56:53 2021 -0400
Smoketest fixes.
---
hack/release/smoke_test/smoke_test.sh | 2 +-
hack/release/wizard/releaseWizard.yaml | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/hack/release/smoke_test/smoke_test.sh
b/hack/release/smoke_test/smoke_test.sh
index 45f1396..9b1d370 100755
--- a/hack/release/smoke_test/smoke_test.sh
+++ b/hack/release/smoke_test/smoke_test.sh
@@ -100,6 +100,6 @@ export PATH="${PATH}:${GOBIN}"
./hack/release/smoke_test/verify_all.sh -v "${VERSION}" -l "${LOCATION}" -g
"${GPG_KEY}"
./hack/release/smoke_test/verify_docker.sh -v "${VERSION}" -i "${IMAGE}"
"${GIT_SHA_PASS_THROUGH[@]}" "${PULL_PASS_THROUGH}"
./hack/release/smoke_test/test_source.sh -v "${VERSION}" -l "${LOCATION}"
-./hack/release/smoke_test/test_cluster.sh -v "${VERSION}" -i "${IMAGE}" -l
"${LOCATION}" -g "${GPG_KEY}" "${GIT_SHA_PASS_THROUGH[@]}"
+./hack/release/smoke_test/test_cluster.sh -v "${VERSION}" -i "${IMAGE}" -l
"${LOCATION}" -g "${GPG_KEY}"
printf "\n\n********************\nSuccessfully smoke tested the Solr Operator
%s!\n" "${VERSION}"
diff --git a/hack/release/wizard/releaseWizard.yaml
b/hack/release/wizard/releaseWizard.yaml
index 2ad929d..384f05f 100644
--- a/hack/release/wizard/releaseWizard.yaml
+++ b/hack/release/wizard/releaseWizard.yaml
@@ -626,6 +626,9 @@ groups:
logfile: git_clean.log
tee: true
- !Command
+ cmd: git branch --set-upstream-to=origin/{{ release_branch }} {{
release_branch }}
+ tee: true
+ - !Command
cmd: git pull --ff-only
tee: true
- !Command
