Skip to content

Commit

Permalink
Update tests after changing default image to Ubuntu 20.04
Browse files Browse the repository at this point in the history
  • Loading branch information
Ciprian Hacman committed Jun 6, 2020
1 parent 268aec8 commit 9e43c40
Show file tree
Hide file tree
Showing 9 changed files with 74 additions and 1,021 deletions.
11 changes: 7 additions & 4 deletions config/jobs/kubernetes/kops/build-grid.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
- --kops-args={{kops_args}}
- --kops-image={{kops_image}}
- --kops-priority-path=/workspace/kubernetes/platforms/linux/amd64
- --kops-ssh-user={{kops_ssh_user}}
- --kops-version=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt
- --provider=aws
- --test_args={{test_args}}
Expand Down Expand Up @@ -79,6 +78,11 @@ def build_cron(key):

job_count += 1

# run Ubuntu 20.04 (Focal) jobs more frequently
if "u2004" in key:
runs_per_week += 7
return "%d %d * * *" % (minute, hour)

# run hotlist jobs more frequently
if key in run_hourly:
runs_per_week += 24 * 7
Expand Down Expand Up @@ -107,7 +111,7 @@ def build_test(cloud='aws', distro=None, networking=None, k8s_version=None):
# pylint: disable=too-many-statements,too-many-branches

if distro is None:
kops_ssh_user = 'admin'
kops_ssh_user = 'ubuntu'
kops_image = None
elif distro == 'amzn2':
kops_ssh_user = 'ec2-user'
Expand All @@ -132,7 +136,7 @@ def build_test(cloud='aws', distro=None, networking=None, k8s_version=None):
kops_image = '099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20200430'
elif distro == 'u2004':
kops_ssh_user = 'ubuntu'
kops_image = '099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20200423'
kops_image = '099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20200528'
elif distro == 'rhel7':
kops_ssh_user = 'ec2-user'
kops_image = '309956199498/RHEL-7.8_HVM_GA-20200225-x86_64-1-Hourly2-GP2'
Expand Down Expand Up @@ -232,7 +236,6 @@ def expand(s):
]

distro_options = [
None,
'amzn2',
'centos7',
'deb9',
Expand Down
12 changes: 1 addition & 11 deletions config/jobs/kubernetes/kops/kops-periodics-distros.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ periodics:
- --ginkgo-parallel
- --kops-image=379101102735/debian-stretch-hvm-x86_64-gp2-2020-02-10-73984
- --kops-priority-path=/workspace/kubernetes/platforms/linux/amd64
- --kops-ssh-user=admin
- --kops-version=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt
- --provider=aws
- --test_args=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|\[HPA\]|Dashboard|Services.*functioning.*NodePort
Expand Down Expand Up @@ -61,7 +60,6 @@ periodics:
- --ginkgo-parallel
- --kops-image=136693071363/debian-10-amd64-20200511-260
- --kops-priority-path=/workspace/kubernetes/platforms/linux/amd64
- --kops-ssh-user=admin
- --kops-version=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt
- --provider=aws
- --test_args=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|\[HPA\]|Dashboard|Services.*functioning.*NodePort
Expand Down Expand Up @@ -97,7 +95,6 @@ periodics:
- --ginkgo-parallel
- --kops-image=099720109477/ubuntu/images/hvm-ssd/ubuntu-xenial-16.04-amd64-server-20200429
- --kops-priority-path=/workspace/kubernetes/platforms/linux/amd64
- --kops-ssh-user=ubuntu
- --kops-version=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt
- --provider=aws
- --test_args=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|\[HPA\]|Dashboard|Services.*functioning.*NodePort
Expand Down Expand Up @@ -133,7 +130,6 @@ periodics:
- --ginkgo-parallel
- --kops-image=099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20200430
- --kops-priority-path=/workspace/kubernetes/platforms/linux/amd64
- --kops-ssh-user=ubuntu
- --kops-version=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt
- --provider=aws
- --test_args=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|\[HPA\]|Dashboard|Services.*functioning.*NodePort
Expand Down Expand Up @@ -167,9 +163,8 @@ periodics:
- --env=KOPS_RUN_TOO_NEW_VERSION=1
- --extract=release/stable
- --ginkgo-parallel
- --kops-image=099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20200423
- --kops-image=099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20200528
- --kops-priority-path=/workspace/kubernetes/platforms/linux/amd64
- --kops-ssh-user=ubuntu
- --kops-version=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt
- --provider=aws
- --test_args=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|\[HPA\]|Dashboard|Services.*functioning.*NodePort
Expand Down Expand Up @@ -205,7 +200,6 @@ periodics:
- --ginkgo-parallel
- --kops-image=679593333241/CentOS Linux 7 x86_64 HVM EBS ENA 2002_01-b7ee8a69-ee97-4a49-9e68-afaee216db2e-ami-0042af67f8e4dcc20.4
- --kops-priority-path=/workspace/kubernetes/platforms/linux/amd64
- --kops-ssh-user=centos
- --kops-version=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt
- --provider=aws
- --test_args=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|\[HPA\]|Dashboard|Services.*functioning.*NodePort
Expand Down Expand Up @@ -241,7 +235,6 @@ periodics:
- --ginkgo-parallel
- --kops-image=137112412989/amzn2-ami-hvm-2.0.20200406.0-x86_64-gp2
- --kops-priority-path=/workspace/kubernetes/platforms/linux/amd64
- --kops-ssh-user=ec2-user
- --kops-version=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt
- --provider=aws
- --test_args=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|\[NodeFeature:RuntimeHandler\]|\[HPA\]|Dashboard|Services.*functioning.*NodePort
Expand Down Expand Up @@ -277,7 +270,6 @@ periodics:
- --ginkgo-parallel
- --kops-image=309956199498/RHEL-7.8_HVM_GA-20200225-x86_64-1-Hourly2-GP2
- --kops-priority-path=/workspace/kubernetes/platforms/linux/amd64
- --kops-ssh-user=ec2-user
- --kops-version=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt
- --provider=aws
- --test_args=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|\[HPA\]|Dashboard|Services.*functioning.*NodePort
Expand Down Expand Up @@ -313,7 +305,6 @@ periodics:
- --ginkgo-parallel
- --kops-image=309956199498/RHEL-8.2.0_HVM-20200423-x86_64-0-Hourly2-GP2
- --kops-priority-path=/workspace/kubernetes/platforms/linux/amd64
- --kops-ssh-user=ec2-user
- --kops-version=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt
- --provider=aws
- --test_args=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|\[HPA\]|Dashboard|Services.*functioning.*NodePort
Expand Down Expand Up @@ -349,7 +340,6 @@ periodics:
- --ginkgo-parallel
- --kops-image=075585003325/Flatcar-stable-2512.2.0-hvm
- --kops-priority-path=/workspace/kubernetes/platforms/linux/amd64
- --kops-ssh-user=core
- --kops-version=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt
- --provider=aws
- --test_args=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|\[HPA\]|Dashboard|Services.*functioning.*NodePort
Expand Down
Loading

0 comments on commit 9e43c40

Please sign in to comment.