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

Kops - Fix branch names for release pipelines #18260

Merged
merged 1 commit into from
Jul 10, 2020
Merged

Kops - Fix branch names for release pipelines #18260

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
6 changes: 5 additions & 1 deletion config/jobs/kubernetes/kops/build-pipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,18 @@ def expand(s):
name = name.replace('.', '')

y = template
y = y.replace('{{branch}}', branch)
y = y.replace('{{extract}}', extract)
y = y.replace('{{e2e_image}}', e2e_image)
y = y.replace('{{k8s_version}}', k8s_version)
y = y.replace('{{name}}', name)
y = y.replace('{{ssh_user}}', ssh_user)
y = y.replace('{{tab}}', tab)

if branch == 'master':
y = y.replace('{{branch}}', "master")
else:
y = y.replace('{{branch}}', "release-" + branch)

spec = {
'branch': branch,
'k8s_version': k8s_version,
Expand Down
18 changes: 9 additions & 9 deletions config/jobs/kubernetes/kops/kops-pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ periodics:
testgrid-tab-name: kops-pipeline-updown-master

# {"branch": "1.16", "k8s_version": "1.16"}
# Verify the latest-ci version from the 1.16 branch of kops
# Verify the latest-ci version from the release-1.16 branch of kops
# Runs a small subset of the e2e tests.
# Publishes the version to latest-ci-updown-green on success.
- interval: 60m
Expand Down Expand Up @@ -86,8 +86,8 @@ periodics:
- --kops-state=s3://k8s-kops-prow/
- --kops-ssh-key=$(AWS_SSH_PRIVATE_KEY_FILE)
- --kops-ssh-public-key=$(AWS_SSH_PUBLIC_KEY_FILE)
- --kops-publish=gs://k8s-staging-kops/kops/releases/markers/1.16/latest-ci-updown-green.txt
- --kops-version=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/1.16/latest-ci.txt
- --kops-publish=gs://k8s-staging-kops/kops/releases/markers/release-1.16/latest-ci-updown-green.txt
- --kops-version=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/release-1.16/latest-ci.txt
#- --kops-kubernetes-version should be inferred by kubetest from --extract
#- --kops-zone should be randomized by kubetest
# Specific test args
Expand All @@ -98,7 +98,7 @@ periodics:
testgrid-tab-name: kops-pipeline-updown-1.16

# {"branch": "1.17", "k8s_version": "1.17"}
# Verify the latest-ci version from the 1.17 branch of kops
# Verify the latest-ci version from the release-1.17 branch of kops
# Runs a small subset of the e2e tests.
# Publishes the version to latest-ci-updown-green on success.
- interval: 60m
Expand Down Expand Up @@ -134,8 +134,8 @@ periodics:
- --kops-state=s3://k8s-kops-prow/
- --kops-ssh-key=$(AWS_SSH_PRIVATE_KEY_FILE)
- --kops-ssh-public-key=$(AWS_SSH_PUBLIC_KEY_FILE)
- --kops-publish=gs://k8s-staging-kops/kops/releases/markers/1.17/latest-ci-updown-green.txt
- --kops-version=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/1.17/latest-ci.txt
- --kops-publish=gs://k8s-staging-kops/kops/releases/markers/release-1.17/latest-ci-updown-green.txt
- --kops-version=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/release-1.17/latest-ci.txt
#- --kops-kubernetes-version should be inferred by kubetest from --extract
#- --kops-zone should be randomized by kubetest
# Specific test args
Expand All @@ -146,7 +146,7 @@ periodics:
testgrid-tab-name: kops-pipeline-updown-1.17

# {"branch": "1.18", "k8s_version": "1.18"}
# Verify the latest-ci version from the 1.18 branch of kops
# Verify the latest-ci version from the release-1.18 branch of kops
# Runs a small subset of the e2e tests.
# Publishes the version to latest-ci-updown-green on success.
- interval: 60m
Expand Down Expand Up @@ -182,8 +182,8 @@ periodics:
- --kops-state=s3://k8s-kops-prow/
- --kops-ssh-key=$(AWS_SSH_PRIVATE_KEY_FILE)
- --kops-ssh-public-key=$(AWS_SSH_PUBLIC_KEY_FILE)
- --kops-publish=gs://k8s-staging-kops/kops/releases/markers/1.18/latest-ci-updown-green.txt
- --kops-version=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/1.18/latest-ci.txt
- --kops-publish=gs://k8s-staging-kops/kops/releases/markers/release-1.18/latest-ci-updown-green.txt
- --kops-version=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/release-1.18/latest-ci.txt
#- --kops-kubernetes-version should be inferred by kubetest from --extract
#- --kops-zone should be randomized by kubetest
# Specific test args
Expand Down