From 91b23caa1916b617cad31625389c1082ee0c9c8e Mon Sep 17 00:00:00 2001 From: Maxime Guyot <Miouge1@users.noreply.github.com> Date: Tue, 17 Dec 2019 16:09:59 +0100 Subject: [PATCH] Remove GCE tests files (#5459) --- .gitlab-ci.yml | 1 - .gitlab-ci/gce.yml | 247 ------------------- tests/files/gce_centos-weave-kubeadm-sep.yml | 16 -- tests/files/gce_centos7-calico-ha.yml | 17 -- tests/files/gce_centos7-flannel-addons.yml | 29 --- tests/files/gce_centos7-kube-router.yml | 13 - tests/files/gce_centos7-multus-calico.yml | 13 - tests/files/gce_coreos-alpha-weave-ha.yml | 14 -- tests/files/gce_coreos-calico-aio.yml | 16 -- tests/files/gce_coreos-canal.yml | 13 - tests/files/gce_coreos-cilium.yml | 14 -- tests/files/gce_coreos-kube-router.yml | 15 -- tests/files/gce_debian9-calico-upgrade.yml | 11 - tests/files/gce_opensuse-canal.yml | 11 - tests/files/gce_oracle-canal.yml | 14 -- tests/files/gce_rhel7-canal-sep.yml | 11 - tests/files/gce_rhel7-weave.yml | 11 - tests/files/gce_ubuntu-canal-ha.yml | 11 - tests/files/gce_ubuntu-canal-kubeadm.yml | 14 -- tests/files/gce_ubuntu-contiv-sep.yml | 12 - tests/files/gce_ubuntu-flannel-ha.yml | 15 -- tests/files/gce_ubuntu-kube-router-sep.yml | 13 - tests/files/gce_ubuntu-weave-sep.yml | 11 - tests/files/gce_ubuntu18-cilium-sep.yml | 12 - tests/files/gce_ubuntu18-flannel-aio.yml | 14 -- 25 files changed, 568 deletions(-) delete mode 100644 .gitlab-ci/gce.yml delete mode 100644 tests/files/gce_centos-weave-kubeadm-sep.yml delete mode 100644 tests/files/gce_centos7-calico-ha.yml delete mode 100644 tests/files/gce_centos7-flannel-addons.yml delete mode 100644 tests/files/gce_centos7-kube-router.yml delete mode 100644 tests/files/gce_centos7-multus-calico.yml delete mode 100644 tests/files/gce_coreos-alpha-weave-ha.yml delete mode 100644 tests/files/gce_coreos-calico-aio.yml delete mode 100644 tests/files/gce_coreos-canal.yml delete mode 100644 tests/files/gce_coreos-cilium.yml delete mode 100644 tests/files/gce_coreos-kube-router.yml delete mode 100644 tests/files/gce_debian9-calico-upgrade.yml delete mode 100644 tests/files/gce_opensuse-canal.yml delete mode 100644 tests/files/gce_oracle-canal.yml delete mode 100644 tests/files/gce_rhel7-canal-sep.yml delete mode 100644 tests/files/gce_rhel7-weave.yml delete mode 100644 tests/files/gce_ubuntu-canal-ha.yml delete mode 100644 tests/files/gce_ubuntu-canal-kubeadm.yml delete mode 100644 tests/files/gce_ubuntu-contiv-sep.yml delete mode 100644 tests/files/gce_ubuntu-flannel-ha.yml delete mode 100644 tests/files/gce_ubuntu-kube-router-sep.yml delete mode 100644 tests/files/gce_ubuntu-weave-sep.yml delete mode 100644 tests/files/gce_ubuntu18-cilium-sep.yml delete mode 100644 tests/files/gce_ubuntu18-flannel-aio.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d5f92a612..faea911c8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,6 @@ stages: - deploy-part1 - moderator - deploy-part2 - - deploy-gce - deploy-special variables: diff --git a/.gitlab-ci/gce.yml b/.gitlab-ci/gce.yml deleted file mode 100644 index f8ad8073f..000000000 --- a/.gitlab-ci/gce.yml +++ /dev/null @@ -1,247 +0,0 @@ ---- -.gce_variables: &gce_variables - GCE_USER: travis - SSH_USER: $GCE_USER - CLOUD_MACHINE_TYPE: "g1-small" - CI_PLATFORM: "gce" - PRIVATE_KEY: $GCE_PRIVATE_KEY - -.cache: &cache - cache: - key: "$CI_BUILD_REF_NAME" - paths: - - downloads/ - - $HOME/.cache - -.gce: &gce - extends: .testcases - <<: *cache - variables: - <<: *gce_variables - tags: - - gce - except: ['triggers'] - only: [/^pr-.*$/] - -.centos_weave_kubeadm_variables: ¢os_weave_kubeadm_variables - # stage: deploy-part1 - UPGRADE_TEST: "graceful" - -.centos7_multus_calico_variables: ¢os7_multus_calico_variables - # stage: deploy-gce - UPGRADE_TEST: "graceful" - -# Builds for PRs only (premoderated by unit-tests step) and triggers (auto) -### PR JOBS PART1 - -gce_ubuntu18-flannel-aio: - stage: deploy-part1 - <<: *gce - when: manual - -### PR JOBS PART2 - -gce_coreos-calico-aio: - stage: deploy-gce - <<: *gce - when: on_success - -gce_centos7-flannel-addons: - stage: deploy-gce - <<: *gce - when: manual - -### MANUAL JOBS - -gce_centos-weave-kubeadm-sep: - stage: deploy-gce - extends: .gce - variables: - <<: *centos_weave_kubeadm_variables - when: on_success - only: ['triggers'] - except: [] - -gce_ubuntu-weave-sep: - stage: deploy-gce - <<: *gce - when: manual - only: ['triggers'] - except: [] - -gce_coreos-calico-sep-triggers: - stage: deploy-gce - <<: *gce - when: on_success - only: ['triggers'] - except: [] - -gce_ubuntu-canal-ha-triggers: - stage: deploy-special - <<: *gce - when: on_success - only: ['triggers'] - except: [] - -gce_centos7-flannel-addons-triggers: - stage: deploy-gce - <<: *gce - when: on_success - only: ['triggers'] - except: [] - -gce_ubuntu-weave-sep-triggers: - stage: deploy-gce - <<: *gce - when: on_success - only: ['triggers'] - except: [] - -# More builds for PRs/merges (manual) and triggers (auto) - - -gce_ubuntu-canal-ha: - stage: deploy-special - <<: *gce - when: manual - -gce_ubuntu-canal-kubeadm: - stage: deploy-gce - <<: *gce - when: manual - -gce_ubuntu-canal-kubeadm-triggers: - stage: deploy-gce - <<: *gce - when: on_success - only: ['triggers'] - except: [] - -gce_ubuntu-flannel-ha: - stage: deploy-gce - <<: *gce - when: manual - -gce_centos-weave-kubeadm-triggers: - stage: deploy-gce - extends: .gce - variables: - <<: *centos_weave_kubeadm_variables - when: on_success - only: ['triggers'] - except: [] - -gce_ubuntu-contiv-sep: - stage: deploy-special - <<: *gce - when: manual - -gce_coreos-cilium: - stage: deploy-special - <<: *gce - when: manual - -gce_ubuntu18-cilium-sep: - stage: deploy-special - <<: *gce - when: manual - -gce_rhel7-weave: - stage: deploy-gce - <<: *gce - when: manual - -gce_rhel7-weave-triggers: - stage: deploy-gce - <<: *gce - when: on_success - only: ['triggers'] - except: [] - -gce_debian9-calico-upgrade: - stage: deploy-gce - <<: *gce - when: manual - -gce_debian9-calico-triggers: - stage: deploy-gce - <<: *gce - when: on_success - only: ['triggers'] - except: [] - -gce_coreos-canal: - stage: deploy-gce - <<: *gce - when: manual - -gce_coreos-canal-triggers: - stage: deploy-gce - <<: *gce - when: on_success - only: ['triggers'] - except: [] - -gce_rhel7-canal-sep: - stage: deploy-special - <<: *gce - when: manual - -gce_rhel7-canal-sep-triggers: - stage: deploy-gce - <<: *gce - when: on_success - only: ['triggers'] - except: [] - -gce_centos7-calico-ha: - stage: deploy-special - <<: *gce - when: manual - -gce_centos7-calico-ha-triggers: - stage: deploy-gce - <<: *gce - when: on_success - only: ['triggers'] - except: [] - -gce_centos7-kube-router: - stage: deploy-special - <<: *gce - when: manual - -gce_centos7-multus-calico: - stage: deploy-gce - extends: .gce - variables: - <<: *centos7_multus_calico_variables - when: manual - -gce_oracle-canal: - stage: deploy-gce - <<: *gce - when: manual - except: ['triggers'] - only: ['master', /^pr-.*$/] - -gce_opensuse-canal: - stage: deploy-gce - <<: *gce - when: manual - -# no triggers yet https://github.com/kubernetes-incubator/kargo/issues/613 -gce_coreos-alpha-weave-ha: - stage: deploy-special - <<: *gce - when: manual - -gce_coreos-kube-router: - stage: deploy-special - <<: *gce - when: manual - -gce_ubuntu-kube-router-sep: - stage: deploy-special - <<: *gce - when: manual diff --git a/tests/files/gce_centos-weave-kubeadm-sep.yml b/tests/files/gce_centos-weave-kubeadm-sep.yml deleted file mode 100644 index 84b604f1b..000000000 --- a/tests/files/gce_centos-weave-kubeadm-sep.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -# Instance settings -cloud_image_family: centos-7 -cloud_machine_type: "n1-standard-1" -cloud_region: us-central1-b -mode: ha - -startup_script: "" - -# Deployment settings -kube_network_plugin: weave -kubeadm_enabled: true -deploy_netchecker: true -kubernetes_audit: true -dns_min_replicas: 1 -cloud_provider: gce diff --git a/tests/files/gce_centos7-calico-ha.yml b/tests/files/gce_centos7-calico-ha.yml deleted file mode 100644 index 741897d27..000000000 --- a/tests/files/gce_centos7-calico-ha.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -# Instance settings -cloud_image_family: centos-7 -cloud_region: us-central1-c -cloud_machine_type: "n1-standard-2" -mode: ha - -# Deployment settings -kube_network_plugin: calico -download_localhost: true -download_run_once: true -deploy_netchecker: true -cloud_provider: gce -dns_min_replicas: 1 -typha_enabled: true -calico_backend: kdd -typha_secure: true diff --git a/tests/files/gce_centos7-flannel-addons.yml b/tests/files/gce_centos7-flannel-addons.yml deleted file mode 100644 index 79232f577..000000000 --- a/tests/files/gce_centos7-flannel-addons.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -# Instance settings -cloud_image_family: centos-7 -cloud_region: us-central1-c -cloud_machine_type: "n1-standard-2" -mode: ha - -# Kubespray settings -kubeadm_control_plane: true -kubeadm_certificate_key: 3998c58db6497dd17d909394e62d515368c06ec617710d02edea31c06d741085 -kube_proxy_mode: iptables -kube_network_plugin: flannel -helm_enabled: true -kubernetes_audit: true -container_manager: containerd -etcd_events_cluster_enabled: true -local_volume_provisioner_enabled: true -etcd_deployment_type: host -deploy_netchecker: true -dns_min_replicas: 1 -kube_encrypt_secret_data: true -ingress_nginx_enabled: true -cert_manager_enabled: true -# Disable as health checks are still unstable and slow to respond. -metrics_server_enabled: false -metrics_server_kubelet_insecure_tls: true -kube_token_auth: true -kube_basic_auth: true -enable_nodelocaldns: false diff --git a/tests/files/gce_centos7-kube-router.yml b/tests/files/gce_centos7-kube-router.yml deleted file mode 100644 index 1bdc49484..000000000 --- a/tests/files/gce_centos7-kube-router.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Instance settings -cloud_image_family: centos-7 -cloud_region: us-central1-c -cloud_machine_type: "n1-standard-2" -mode: default - -# Deployment settings -kube_network_plugin: kube-router -deploy_netchecker: true -enable_network_policy: true -dns_min_replicas: 1 -cloud_provider: gce diff --git a/tests/files/gce_centos7-multus-calico.yml b/tests/files/gce_centos7-multus-calico.yml deleted file mode 100644 index 31c6fd5ee..000000000 --- a/tests/files/gce_centos7-multus-calico.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Instance settings -cloud_image_family: centos-7 -cloud_region: us-central1-c -cloud_machine_type: "n1-standard-2" -mode: default - -# Deployment settings -kube_network_plugin_multus: true -kube_network_plugin: calico -deploy_netchecker: true -dns_min_replicas: 1 -cloud_provider: gce diff --git a/tests/files/gce_coreos-alpha-weave-ha.yml b/tests/files/gce_coreos-alpha-weave-ha.yml deleted file mode 100644 index 4c91b251e..000000000 --- a/tests/files/gce_coreos-alpha-weave-ha.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -# Instance settings -cloud_image_family: coreos-alpha -cloud_region: us-central1-a -cloud_machine_type: "n1-standard-1" -mode: ha -startup_script: 'systemctl disable locksmithd && systemctl stop locksmithd' - -# Deployment settings -kube_network_plugin: weave -resolvconf_mode: host_resolvconf # this is required as long as the coreos stable channel uses docker < 1.12 -deploy_netchecker: true -dns_min_replicas: 1 -cloud_provider: gce diff --git a/tests/files/gce_coreos-calico-aio.yml b/tests/files/gce_coreos-calico-aio.yml deleted file mode 100644 index bb60e7afc..000000000 --- a/tests/files/gce_coreos-calico-aio.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -# Instance settings -cloud_image_family: coreos-stable -cloud_region: us-central1-a -cloud_machine_type: "n1-standard-2" -mode: aio -## user-data to simply turn off coreos upgrades -startup_script: 'systemctl disable locksmithd && systemctl stop locksmithd' - -# Deployment settings -no_group_vars: true -kube_network_plugin: calico -resolvconf_mode: host_resolvconf # this is required as long as the coreos stable channel uses docker < 1.12 -deploy_netchecker: true -dns_min_replicas: 1 -cloud_provider: gce diff --git a/tests/files/gce_coreos-canal.yml b/tests/files/gce_coreos-canal.yml deleted file mode 100644 index f18f2f36d..000000000 --- a/tests/files/gce_coreos-canal.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Instance settings -cloud_image_family: coreos-stable -cloud_region: us-central1-c -mode: default -startup_script: 'systemctl disable locksmithd && systemctl stop locksmithd' - -# Deployment settings -kube_network_plugin: canal -resolvconf_mode: host_resolvconf # this is required as long as the coreos stable channel uses docker < 1.12 -deploy_netchecker: true -dns_min_replicas: 1 -cloud_provider: gce diff --git a/tests/files/gce_coreos-cilium.yml b/tests/files/gce_coreos-cilium.yml deleted file mode 100644 index 08848cea6..000000000 --- a/tests/files/gce_coreos-cilium.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -# Instance settings -cloud_image_family: coreos-stable -cloud_region: us-central1-c -mode: default -startup_script: 'systemctl disable locksmithd && systemctl stop locksmithd' - -# Deployment settings -kube_network_plugin: cilium -resolvconf_mode: host_resolvconf # this is required as long as the coreos stable channel uses docker < 1.12 -deploy_netchecker: true -enable_network_policy: true -dns_min_replicas: 1 -cloud_provider: gce diff --git a/tests/files/gce_coreos-kube-router.yml b/tests/files/gce_coreos-kube-router.yml deleted file mode 100644 index 6c3755991..000000000 --- a/tests/files/gce_coreos-kube-router.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -# Instance settings -cloud_image_family: coreos-stable -cloud_region: us-central1-c -cloud_machine_type: "n1-standard-2" -mode: default -startup_script: 'systemctl disable locksmithd && systemctl stop locksmithd' - -# Deployment settings -kube_network_plugin: kube-router -bootstrap_os: coreos -resolvconf_mode: host_resolvconf # this is required as long as the coreos stable channel uses docker < 1.12 -deploy_netchecker: true -dns_min_replicas: 1 -cloud_provider: gce diff --git a/tests/files/gce_debian9-calico-upgrade.yml b/tests/files/gce_debian9-calico-upgrade.yml deleted file mode 100644 index d634a6f33..000000000 --- a/tests/files/gce_debian9-calico-upgrade.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# Instance settings -cloud_image: debian-9-kubespray -cloud_region: us-central1-b -mode: default - -# Deployment settings -kube_network_plugin: calico -deploy_netchecker: true -dns_min_replicas: 1 -cloud_provider: gce diff --git a/tests/files/gce_opensuse-canal.yml b/tests/files/gce_opensuse-canal.yml deleted file mode 100644 index 4c83ba579..000000000 --- a/tests/files/gce_opensuse-canal.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# Instance settings -cloud_image_family: opensuse-leap -cloud_region: us-central1-c -mode: default - -# Deployment settings -kube_network_plugin: canal -deploy_netchecker: true -dns_min_replicas: 1 -cloud_provider: gce diff --git a/tests/files/gce_oracle-canal.yml b/tests/files/gce_oracle-canal.yml deleted file mode 100644 index f3da8a1a5..000000000 --- a/tests/files/gce_oracle-canal.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -# Instance settings -cloud_image_family: oracle-7 -cloud_region: us-central1-a -cloud_machine_type: "n1-standard-1" -mode: default - -# Deployment settings -kube_network_plugin: canal -dynamic_kubelet_configuration: true -deploy_netchecker: true -kubeadm_enabled: true -kubedns_min_replicas: 1 -cloud_provider: gce diff --git a/tests/files/gce_rhel7-canal-sep.yml b/tests/files/gce_rhel7-canal-sep.yml deleted file mode 100644 index 42e07b1e6..000000000 --- a/tests/files/gce_rhel7-canal-sep.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# Instance settings -cloud_image_family: rhel-7 -cloud_region: us-central1-a -mode: separate - -# Deployment settings -kube_network_plugin: canal -deploy_netchecker: true -dns_min_replicas: 1 -cloud_provider: gce diff --git a/tests/files/gce_rhel7-weave.yml b/tests/files/gce_rhel7-weave.yml deleted file mode 100644 index 723b2289f..000000000 --- a/tests/files/gce_rhel7-weave.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# Instance settings -cloud_image_family: rhel-7 -cloud_region: us-central1-b -mode: default - -# Deployment settings -kube_network_plugin: weave -deploy_netchecker: true -dns_min_replicas: 1 -cloud_provider: gce diff --git a/tests/files/gce_ubuntu-canal-ha.yml b/tests/files/gce_ubuntu-canal-ha.yml deleted file mode 100644 index c1b7c6df8..000000000 --- a/tests/files/gce_ubuntu-canal-ha.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# Instance settings -cloud_image_family: ubuntu-1604-lts -cloud_region: us-central1-b -mode: separate - -# Deployment settings -kube_network_plugin: canal -deploy_netchecker: true -dns_min_replicas: 1 -cloud_provider: gce diff --git a/tests/files/gce_ubuntu-canal-kubeadm.yml b/tests/files/gce_ubuntu-canal-kubeadm.yml deleted file mode 100644 index 705df4870..000000000 --- a/tests/files/gce_ubuntu-canal-kubeadm.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -# Instance settings -cloud_image_family: ubuntu-1604-lts -cloud_machine_type: "n1-standard-1" -cloud_region: us-central1-c -mode: ha - -# Deployment settings -kube_network_plugin: canal -kubeadm_enabled: true -dynamic_kubelet_configuration: true -deploy_netchecker: true -dns_min_replicas: 1 -cloud_provider: gce diff --git a/tests/files/gce_ubuntu-contiv-sep.yml b/tests/files/gce_ubuntu-contiv-sep.yml deleted file mode 100644 index 342d0b890..000000000 --- a/tests/files/gce_ubuntu-contiv-sep.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -# Instance settings -cloud_image_family: ubuntu-1604-lts -cloud_region: us-central1-b -cloud_machine_type: "n1-standard-2" -mode: separate - -# Deployment settings -kube_network_plugin: contiv -deploy_netchecker: true -dns_min_replicas: 1 -cloud_provider: gce diff --git a/tests/files/gce_ubuntu-flannel-ha.yml b/tests/files/gce_ubuntu-flannel-ha.yml deleted file mode 100644 index 4057b27fa..000000000 --- a/tests/files/gce_ubuntu-flannel-ha.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -# Instance settings -cloud_image_family: ubuntu-1604-lts -cloud_region: us-central1-b -cloud_machine_type: "n1-standard-2" -mode: ha - -# Deployment settings -kube_network_plugin: flannel -kubeadm_enabled: true -skip_non_kubeadm_warning: true -deploy_netchecker: true -dns_min_replicas: 1 -cloud_provider: gce -loadbalancer_apiserver_type: haproxy diff --git a/tests/files/gce_ubuntu-kube-router-sep.yml b/tests/files/gce_ubuntu-kube-router-sep.yml deleted file mode 100644 index 6dd926078..000000000 --- a/tests/files/gce_ubuntu-kube-router-sep.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Instance settings -cloud_image_family: ubuntu-1604-lts -cloud_region: us-central1-c -cloud_machine_type: "n1-standard-2" -mode: separate - -# Deployment settings -bootstrap_os: ubuntu -kube_network_plugin: kube-router -deploy_netchecker: true -dns_min_replicas: 1 -cloud_provider: gce diff --git a/tests/files/gce_ubuntu-weave-sep.yml b/tests/files/gce_ubuntu-weave-sep.yml deleted file mode 100644 index dc97de789..000000000 --- a/tests/files/gce_ubuntu-weave-sep.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# Instance settings -cloud_image_family: ubuntu-1604-lts -cloud_region: us-central1-c -mode: separate - -# Deployment settings -kube_network_plugin: weave -deploy_netchecker: true -dns_min_replicas: 1 -cloud_provider: gce diff --git a/tests/files/gce_ubuntu18-cilium-sep.yml b/tests/files/gce_ubuntu18-cilium-sep.yml deleted file mode 100644 index 7d30e6fdb..000000000 --- a/tests/files/gce_ubuntu18-cilium-sep.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -# Instance settings -cloud_image_family: ubuntu-1804-lts -cloud_region: us-central1-b -mode: separate - -# Deployment settings -kube_network_plugin: cilium -deploy_netchecker: true -enable_network_policy: true -dns_min_replicas: 1 -cloud_provider: gce diff --git a/tests/files/gce_ubuntu18-flannel-aio.yml b/tests/files/gce_ubuntu18-flannel-aio.yml deleted file mode 100644 index be8f514dd..000000000 --- a/tests/files/gce_ubuntu18-flannel-aio.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -# Instance settings -cloud_image_family: ubuntu-1804-lts -cloud_region: us-central1-a -cloud_machine_type: "n1-standard-2" -mode: aio - -# Deployment settings -kubeadm_enabled: true -kube_network_plugin: flannel -dynamic_kubelet_configuration: true -deploy_netchecker: true -dns_min_replicas: 1 -cloud_provider: gce -- GitLab