Skip to content

Commit 9f91791

Browse files
committed
refactor(jobs): migrate tikv/migration to the job-folder layout
1 parent df55e7b commit 9f91791

7 files changed

Lines changed: 6 additions & 4 deletions

File tree

File renamed without changes.

pipelines/tikv/migration/latest/pull_integration_kafka_test.groovy renamed to jenkins/jobs/tikv/migration/latest/pull_integration_kafka_test/Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
final K8S_NAMESPACE = "jenkins-tidb"
77
final GIT_FULL_REPO_NAME = 'tikv/migration'
88
final GIT_CREDENTIALS_ID = 'github-sre-bot-ssh'
9-
final POD_TEMPLATE_FILE = 'pipelines/tikv/migration/latest/pod-pull_integration_kafka_test.yaml'
9+
final POD_TEMPLATE_FILE = "jenkins/jobs/tikv/migration/latest/pull_integration_kafka_test/pod.yaml"
1010
final REFS = readJSON(text: params.JOB_SPEC).refs
1111
final COMPONENT_ARTIFACT_BASE_REF = REFS.base_ref == 'main' ? 'master' : REFS.base_ref
1212
final OCI_TAG_TIDB = component.computeArtifactOciTagFromPR('tidb', COMPONENT_ARTIFACT_BASE_REF, REFS.pulls[0].title, 'master')

jobs/tikv/migration/latest/pull_integration_kafka_test.groovy renamed to jenkins/jobs/tikv/migration/latest/pull_integration_kafka_test/dsl.groovy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// REF: https://<your-jenkins-server>/plugin/job-dsl/api-viewer/index.html
22
// For trunk and latest release branches.
3+
final ciGroovyPath = "jenkins/jobs/tikv/migration/latest/pull_integration_kafka_test/Jenkinsfile"
34
pipelineJob('tikv/migration/pull_integration_kafka_test') {
45
logRotator {
56
daysToKeep(30)
@@ -14,7 +15,7 @@ pipelineJob('tikv/migration/pull_integration_kafka_test') {
1415
definition {
1516
cpsScm {
1617
lightweight(true)
17-
scriptPath("pipelines/tikv/migration/latest/pull_integration_kafka_test.groovy")
18+
scriptPath(ciGroovyPath)
1819
scm {
1920
git{
2021
remote {

pipelines/tikv/migration/latest/pod-pull_integration_kafka_test.yaml renamed to jenkins/jobs/tikv/migration/latest/pull_integration_kafka_test/pod.yaml

File renamed without changes.

pipelines/tikv/migration/latest/pull_integration_test.groovy renamed to jenkins/jobs/tikv/migration/latest/pull_integration_test/Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
final K8S_NAMESPACE = "jenkins-tidb"
77
final GIT_FULL_REPO_NAME = 'tikv/migration'
88
final GIT_CREDENTIALS_ID = 'github-sre-bot-ssh'
9-
final POD_TEMPLATE_FILE = 'pipelines/tikv/migration/latest/pod-pull_integration_test.yaml'
9+
final POD_TEMPLATE_FILE = "jenkins/jobs/tikv/migration/latest/pull_integration_test/pod.yaml"
1010
final REFS = readJSON(text: params.JOB_SPEC).refs
1111
final COMPONENT_ARTIFACT_BASE_REF = REFS.base_ref == 'main' ? 'master' : REFS.base_ref
1212
final OCI_TAG_TIDB = component.computeArtifactOciTagFromPR('tidb', COMPONENT_ARTIFACT_BASE_REF, REFS.pulls[0].title, 'master')

jobs/tikv/migration/latest/pull_integration_test.groovy renamed to jenkins/jobs/tikv/migration/latest/pull_integration_test/dsl.groovy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// REF: https://<your-jenkins-server>/plugin/job-dsl/api-viewer/index.html
22
// For trunk and latest release branches.
3+
final ciGroovyPath = "jenkins/jobs/tikv/migration/latest/pull_integration_test/Jenkinsfile"
34
pipelineJob('tikv/migration/pull_integration_test') {
45
logRotator {
56
daysToKeep(30)
@@ -14,7 +15,7 @@ pipelineJob('tikv/migration/pull_integration_test') {
1415
definition {
1516
cpsScm {
1617
lightweight(true)
17-
scriptPath("pipelines/tikv/migration/latest/pull_integration_test.groovy")
18+
scriptPath(ciGroovyPath)
1819
scm {
1920
git{
2021
remote {

pipelines/tikv/migration/latest/pod-pull_integration_test.yaml renamed to jenkins/jobs/tikv/migration/latest/pull_integration_test/pod.yaml

File renamed without changes.

0 commit comments

Comments
 (0)