Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dynamic branch specifier for E2E tests jobs #3113

Merged
merged 1 commit into from
May 20, 2020
Merged

Dynamic branch specifier for E2E tests jobs #3113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .ci/jobs/e2e-tests-aks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
name: cloud-on-k8s-e2e-tests-aks
project-type: pipeline
parameters:
- string:
name: branch_specifier
default: master
description: "the Git branch specifier to build (<branchName>,<tagName>, <commitId>, etc.)"
- string:
name: JKS_PARAM_OPERATOR_IMAGE
description: "ECK Docker image"
Expand All @@ -16,7 +20,7 @@
- git:
url: https://github.com/elastic/cloud-on-k8s
branches:
- master
- ${branch_specifier}
credentials-id: 'f6c7695a-671e-4f4f-a331-acdce44ff9ba'
script-path: .ci/pipelines/e2e-tests-aks.Jenkinsfile
lightweight-checkout: true
lightweight-checkout: false
8 changes: 6 additions & 2 deletions .ci/jobs/e2e-tests-eks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
name: cloud-on-k8s-e2e-tests-eks
project-type: pipeline
parameters:
- string:
name: branch_specifier
default: master
description: "the Git branch specifier to build (<branchName>,<tagName>, <commitId>, etc.)"
- string:
name: JKS_PARAM_OPERATOR_IMAGE
description: "ECK Docker image"
Expand All @@ -16,7 +20,7 @@
- git:
url: https://github.com/elastic/cloud-on-k8s
branches:
- master
- ${branch_specifier}
credentials-id: 'f6c7695a-671e-4f4f-a331-acdce44ff9ba'
script-path: .ci/pipelines/e2e-tests-eks.Jenkinsfile
lightweight-checkout: true
lightweight-checkout: false
8 changes: 6 additions & 2 deletions .ci/jobs/e2e-tests-gke-k8s-versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
name: cloud-on-k8s-e2e-tests-gke-k8s-versions
project-type: pipeline
parameters:
- string:
name: branch_specifier
default: master
description: "the Git branch specifier to build (<branchName>,<tagName>, <commitId>, etc.)"
- string:
name: JKS_PARAM_OPERATOR_IMAGE
description: "ECK Docker image"
Expand All @@ -16,7 +20,7 @@
- git:
url: https://github.com/elastic/cloud-on-k8s
branches:
- master
- ${branch_specifier}
credentials-id: 'f6c7695a-671e-4f4f-a331-acdce44ff9ba'
script-path: .ci/pipelines/e2e-tests-gke-k8s-versions.Jenkinsfile
lightweight-checkout: true
lightweight-checkout: false
8 changes: 6 additions & 2 deletions .ci/jobs/e2e-tests-kind-k8s-versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
name: cloud-on-k8s-e2e-tests-kind-k8s-versions
project-type: pipeline
parameters:
- string:
name: branch_specifier
default: master
description: "the Git branch specifier to build (<branchName>,<tagName>, <commitId>, etc.)"
- string:
name: JKS_PARAM_OPERATOR_IMAGE
description: "ECK Docker image"
Expand All @@ -16,7 +20,7 @@
- git:
url: https://github.com/elastic/cloud-on-k8s
branches:
- master
- ${branch_specifier}
credentials-id: 'f6c7695a-671e-4f4f-a331-acdce44ff9ba'
script-path: .ci/pipelines/e2e-tests-kind-k8s-versions.Jenkinsfile
lightweight-checkout: true
lightweight-checkout: false
8 changes: 6 additions & 2 deletions .ci/jobs/e2e-tests-ocp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
name: cloud-on-k8s-e2e-tests-ocp
project-type: pipeline
parameters:
- string:
name: branch_specifier
default: master
description: "the Git branch specifier to build (<branchName>,<tagName>, <commitId>, etc.)"
- string:
name: JKS_PARAM_OPERATOR_IMAGE
description: "ECK Docker image"
Expand All @@ -16,7 +20,7 @@
- git:
url: https://github.com/elastic/cloud-on-k8s
branches:
- master
- ${branch_specifier}
credentials-id: 'f6c7695a-671e-4f4f-a331-acdce44ff9ba'
script-path: .ci/pipelines/e2e-tests-ocp.Jenkinsfile
lightweight-checkout: true
lightweight-checkout: false
8 changes: 6 additions & 2 deletions .ci/jobs/e2e-tests-stack-versions-gke.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
name: cloud-on-k8s-e2e-tests-stack-versions
project-type: pipeline
parameters:
- string:
name: branch_specifier
default: master
description: "the Git branch specifier to build (<branchName>,<tagName>, <commitId>, etc.)"
- string:
name: JKS_PARAM_OPERATOR_IMAGE
description: "ECK Docker image"
Expand All @@ -16,7 +20,7 @@
- git:
url: https://github.com/elastic/cloud-on-k8s
branches:
- master
- ${branch_specifier}
credentials-id: 'f6c7695a-671e-4f4f-a331-acdce44ff9ba'
script-path: .ci/pipelines/e2e-tests-stack-versions-gke.Jenkinsfile
lightweight-checkout: true
lightweight-checkout: false
30 changes: 24 additions & 6 deletions .ci/pipelines/build.Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,27 +77,45 @@ pipeline {
def operatorImage = sh(returnStdout: true, script: 'make print-operator-image').trim()

build job: 'cloud-on-k8s-e2e-tests-stack-versions',
parameters: [string(name: 'JKS_PARAM_OPERATOR_IMAGE', value: operatorImage)],
parameters: [
string(name: 'JKS_PARAM_OPERATOR_IMAGE', value: operatorImage),
string(name: 'branch_specifier', value: GIT_COMMIT)
],
wait: false

build job: 'cloud-on-k8s-e2e-tests-gke-k8s-versions',
parameters: [string(name: 'JKS_PARAM_OPERATOR_IMAGE', value: operatorImage)],
parameters: [
string(name: 'JKS_PARAM_OPERATOR_IMAGE', value: operatorImage),
string(name: 'branch_specifier', value: GIT_COMMIT)
],
wait: false

build job: 'cloud-on-k8s-e2e-tests-aks',
parameters: [string(name: 'JKS_PARAM_OPERATOR_IMAGE', value: operatorImage)],
parameters: [
string(name: 'JKS_PARAM_OPERATOR_IMAGE', value: operatorImage),
string(name: 'branch_specifier', value: GIT_COMMIT)
],
wait: false

build job: 'cloud-on-k8s-e2e-tests-kind-k8s-versions',
parameters: [string(name: 'JKS_PARAM_OPERATOR_IMAGE', value: operatorImage)],
parameters: [
string(name: 'JKS_PARAM_OPERATOR_IMAGE', value: operatorImage),
string(name: 'branch_specifier', value: GIT_COMMIT)
],
wait: false

build job: 'cloud-on-k8s-e2e-tests-ocp',
parameters: [string(name: 'JKS_PARAM_OPERATOR_IMAGE', value: operatorImage)],
parameters: [
string(name: 'JKS_PARAM_OPERATOR_IMAGE', value: operatorImage),
string(name: 'branch_specifier', value: GIT_COMMIT)
],
wait: false

build job: 'cloud-on-k8s-e2e-tests-eks',
parameters: [string(name: 'JKS_PARAM_OPERATOR_IMAGE', value: operatorImage)],
parameters: [
string(name: 'JKS_PARAM_OPERATOR_IMAGE', value: operatorImage),
string(name: 'branch_specifier', value: GIT_COMMIT)
],
wait: false
}
}
Expand Down