Browse Source

tests/packet-ci: sanitize branch name for kubernetes labels (#10315)

'/' doesn't work in kubernetes label so we replace it.

Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@proton.ch>
pull/10346/head
Arthur Outhenin-Chalandre 2 years ago
committed by GitHub
parent
commit
1c5f657f97
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
  1. 3
      tests/cloud_playbooks/roles/packet-ci/defaults/main.yml
  2. 2
      tests/cloud_playbooks/roles/packet-ci/tasks/cleanup-old-vms.yml
  3. 2
      tests/cloud_playbooks/roles/packet-ci/tasks/create-vms.yml

3
tests/cloud_playbooks/roles/packet-ci/defaults/main.yml

@ -6,6 +6,9 @@ vm_cpu_sockets: 1
vm_cpu_threads: 2
vm_memory: 2048Mi
# Replace invalid characters so that we can use the branch name in kubernetes labels
branch_name_sane: "{{ branch | regex_replace('/', '-') }}"
# Request/Limit allocation settings
cpu_allocation_ratio: 0.5

2
tests/cloud_playbooks/roles/packet-ci/tasks/cleanup-old-vms.yml

@ -6,7 +6,7 @@
kind: Namespace
label_selectors:
- cijobs = true
- branch = {{ branch }}
- branch = {{ branch_name_sane }}
register: namespaces
- name: Delete older namespaces

2
tests/cloud_playbooks/roles/packet-ci/tasks/create-vms.yml

@ -3,7 +3,7 @@
- name: "Create CI namespace {{ test_name }} for test vms"
shell: |-
kubectl create namespace {{ test_name }} &&
kubectl label namespace {{ test_name }} cijobs=true branch="{{ branch }}" pipeline_id="{{ pipeline_id }}"
kubectl label namespace {{ test_name }} cijobs=true branch="{{ branch_name_sane }}" pipeline_id="{{ pipeline_id }}"
changed_when: false
- name: "Create temp dir /tmp/{{ test_name }} for CI files"

Loading…
Cancel
Save