Skip to content

Commit

Permalink
Revert "fix: comment out one job (#890)" (#892)
Browse files Browse the repository at this point in the history
This reverts commit 1c2cfc7.
  • Loading branch information
huxiaoliang committed Nov 9, 2020
1 parent 1c2cfc7 commit c560e77
Showing 1 changed file with 16 additions and 18 deletions.
34 changes: 16 additions & 18 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ env:
CREATE_INSTANCES_PARAM: ${{ secrets.CREATE_INSTANCES_PARAM }}
PASSWORD: ${{ secrets.PASSWORD }}
NEED_DELETE: ${{ secrets.NEED_DELETE }}
COMMIT_MSG: ${{github.event.head_commit.message}},${{github.event.pull_request.title}},${{github.event.pull_request.body}}
jobs:
image:
name: build tke image
Expand All @@ -35,7 +34,6 @@ jobs:
name: platform test - 1.18.3
needs: image
# if: contains(toJson(github.event.pull_request.labels.*.name), 'platform')
if: contains(env.COMMIT_MSG, 'installer') || contains(env.COMMIT_MSG, 'platform') || contains(env.COMMIT_MSG, 'cluster') || contains(env.COMMIT_MSG, 'gateway') || contains(env.COMMIT_MSG, 'addon') || contains(env.COMMIT_MSG, 'registry')
runs-on: self-hosted
env:
K8SVERSION: 1.18.3
Expand All @@ -48,22 +46,22 @@ jobs:
- name: e2e test
run: |
go test -timeout 40m -v tkestack.io/tke/test/e2e/platform
# platform2:
# name: platform test - 1.16.9
# needs: image
## if: contains(toJson(github.event.pull_request.labels.*.name), 'platform')
# runs-on: self-hosted
# env:
# K8SVERSION: 1.16.9
# steps:
# - name: printversion
# env:
# LABELNAME_CONTEXT: ${{ toJson(github.event.pull_request.labels.*.name) }}
# run: |
# echo "$LABELNAME_CONTEXT"
# - name: e2e test
# run: |
# go test -timeout 40m -v tkestack.io/tke/test/e2e/platform
platform2:
name: platform test - 1.16.9
needs: image
# if: contains(toJson(github.event.pull_request.labels.*.name), 'platform')
runs-on: self-hosted
env:
K8SVERSION: 1.16.9
steps:
- name: printversion
env:
LABELNAME_CONTEXT: ${{ toJson(github.event.pull_request.labels.*.name) }}
run: |
echo "$LABELNAME_CONTEXT"
- name: e2e test
run: |
go test -timeout 40m -v tkestack.io/tke/test/e2e/platform
business:
name: business test
needs: image
Expand Down

0 comments on commit c560e77

Please sign in to comment.