From 77a74adeddb2c2a86a5f61de988fdbce6f5fbdbe Mon Sep 17 00:00:00 2001
From: Florian Ruynat <16313165+floryut@users.noreply.github.com>
Date: Mon, 30 Aug 2021 17:25:13 +0200
Subject: [PATCH] Bump centos8 CI job memory to 3go and remove mitogen for
fedora CI (#7921)
---
.gitlab-ci/packet.yml | 4 ----
tests/cloud_playbooks/roles/packet-ci/templates/vm.yml.j2 | 2 +-
tests/files/packet_centos8-calico.yml | 1 +
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml
index 30daff2b4..6d52929e2 100644
--- a/.gitlab-ci/packet.yml
+++ b/.gitlab-ci/packet.yml
@@ -177,15 +177,11 @@ packet_fedora33-calico:
stage: deploy-part2
extends: .packet_periodic
when: on_success
- variables:
- MITOGEN_ENABLE: "true"
packet_fedora34-calico-selinux:
stage: deploy-part2
extends: .packet_periodic
when: on_success
- variables:
- MITOGEN_ENABLE: "true"
packet_amazon-linux-2-aio:
stage: deploy-part2
diff --git a/tests/cloud_playbooks/roles/packet-ci/templates/vm.yml.j2 b/tests/cloud_playbooks/roles/packet-ci/templates/vm.yml.j2
index 4db319404..6a8e02721 100644
--- a/tests/cloud_playbooks/roles/packet-ci/templates/vm.yml.j2
+++ b/tests/cloud_playbooks/roles/packet-ci/templates/vm.yml.j2
@@ -31,7 +31,7 @@ spec:
cpu:
cores: {{ vm_cpu_cores }}
sockets: {{ vm_cpu_sockets }}
- threads: {{ vm_cpu_cores }}
+ threads: {{ vm_cpu_threads }}
resources:
requests:
memory: {{ vm_memory * memory_allocation_ratio }}
diff --git a/tests/files/packet_centos8-calico.yml b/tests/files/packet_centos8-calico.yml
index 680238720..80b2f9c8d 100644
--- a/tests/files/packet_centos8-calico.yml
+++ b/tests/files/packet_centos8-calico.yml
@@ -2,6 +2,7 @@
# Instance settings
cloud_image: centos-8
mode: default
+vm_memory: 3072Mi
# Kubespray settings
kube_network_plugin: calico
--
GitLab