Skip to content

Commit 398e990

Browse files
committed
Configure separate jobs for JVM and native smoke tests
1 parent 83e0c15 commit 398e990

File tree

3 files changed

+33
-3
lines changed

3 files changed

+33
-3
lines changed

ci/pipeline-template/pipeline.yml

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
file: git-repo/ci/pipeline.yml
6767
#@ for group in data.values.groups:
6868
#@ for smoke_test in group.smoke_tests:
69-
- name: #@ smoke_test
69+
- name: #@ smoke_test + "-jvm"
7070
serial: true
7171
public: true
7272
plan:
@@ -83,6 +83,31 @@ jobs:
8383
params:
8484
BRANCH: #@ branch
8585
SMOKE_TEST: #@ smoke_test
86+
TASK: jvmAotTest
87+
DOCKER_HUB_MIRROR: ((docker-hub-mirror))
88+
GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
89+
GRADLE_ENTERPRISE_CACHE_USERNAME: ((gradle_enterprise_cache_user.username))
90+
GRADLE_ENTERPRISE_CACHE_PASSWORD: ((gradle_enterprise_cache_user.password))
91+
- name: #@ smoke_test + "-native"
92+
serial: true
93+
public: true
94+
plan:
95+
- get: ci-image
96+
- get: git-repo
97+
passed:
98+
- #@ smoke_test + "-jvm"
99+
- do:
100+
- task: smoke-test
101+
image: ci-image
102+
privileged: true
103+
timeout: #@ task_timeout
104+
file: git-repo/ci/tasks/smoke-test.yml
105+
tags:
106+
- native
107+
params:
108+
BRANCH: #@ branch
109+
SMOKE_TEST: #@ smoke_test
110+
TASK: nativeAotTest
86111
DOCKER_HUB_MIRROR: ((docker-hub-mirror))
87112
GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
88113
GRADLE_ENTERPRISE_CACHE_USERNAME: ((gradle_enterprise_cache_user.username))
@@ -92,7 +117,11 @@ jobs:
92117
groups:
93118
#@ for group in data.values.groups:
94119
- name: #@ group.name + "-smoke-tests"
95-
jobs: #@ group.smoke_tests
120+
jobs:
121+
#@ for smoke_test in group.smoke_tests:
122+
- #@ smoke_test + "-jvm"
123+
- #@ smoke_test + "-native"
124+
#@ end
96125
#@ end
97126
- name: "infrastructure"
98127
jobs:

ci/scripts/smoke-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ set -e
44
source $(dirname $0)/common.sh
55

66
pushd git-repo > /dev/null
7-
./gradlew --no-daemon ${SMOKE_TEST}:build
7+
./gradlew --no-daemon ${SMOKE_TEST}:${TASK}
88
popd > /dev/null

ci/tasks/smoke-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ params:
1212
BRANCH:
1313
CI: true
1414
SMOKE_TEST:
15+
TASK:
1516
DOCKER_HUB_MIRROR:
1617
run:
1718
path: bash

0 commit comments

Comments
 (0)