Skip to content

Commit

Permalink
Fix the error in the helm chart e2e test and the sha not exposed in t…
Browse files Browse the repository at this point in the history
…he push event (#1573)

* Use the latest tag for the vineyard operator image in the generated helm chart e2e test.
* Fix the sha not exposed in the push event.

Signed-off-by: Ye Cao <caoye.cao@alibaba-inc.com>
  • Loading branch information
dashanji authored Sep 20, 2023
1 parent 11dfc19 commit af67546
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/vineyard-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -297,11 +297,8 @@ jobs:
- name: Leave a message for logs URL
if: ${{ failure() }}
run: |
if [[ -n ${{ github.event.pull_request.head.sha }} ]]; then
short_sha=$(git rev-parse --short ${{ github.event.pull_request.head.sha }})
else
short_sha=$(git rev-parse --short ${{ github.event.push.head.sha }})
fi
sha=${{ github.event.pull_request.head.sha || github.sha }}
short_sha=$(git rev-parse --short $sha)
case ${{ matrix.job }} in
e2e-tests-spill)
signed_url_key=0707
Expand Down
3 changes: 2 additions & 1 deletion k8s/test/e2e/autogenerated-helm-chart/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ setup:
helm install vineyard-operator charts/vineyard-operator \
--create-namespace \
--namespace vineyard-system \
--set controllerManager.manager.image.repository=localhost:5001/vineyard-operator
--set controllerManager.manager.image.repository=localhost:5001/vineyard-operator \
--set controllerManager.manager.image.tag=latest
wait:
- namespace: vineyard-system
resource: deployment/vineyard-operator-controller-manager
Expand Down

0 comments on commit af67546

Please sign in to comment.