From 4df6e352704a428c5b47fd332942578e73b69cf3 Mon Sep 17 00:00:00 2001
From: Florian Ruynat <16313165+floryut@users.noreply.github.com>
Date: Tue, 26 Jul 2022 22:47:49 +0200
Subject: [PATCH] Move oracle7-canal to centos7-canal
---
.gitlab-ci/packet.yml | 2 +-
docs/ci.md | 5 +----
...cket_oracle7-canal-ha.yml => packet_centos7-canal-ha.yml} | 2 +-
3 files changed, 3 insertions(+), 6 deletions(-)
rename tests/files/{packet_oracle7-canal-ha.yml => packet_centos7-canal-ha.yml} (85%)
diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml
index 258de185f..ad56ffa4b 100644
--- a/.gitlab-ci/packet.yml
+++ b/.gitlab-ci/packet.yml
@@ -214,7 +214,7 @@ packet_centos7-multus-calico:
extends: .packet_pr
when: manual
-packet_oracle7-canal-ha:
+packet_centos7-canal-ha:
stage: deploy-part2
extends: .packet_pr
when: manual
diff --git a/docs/ci.md b/docs/ci.md
index 195a0b05d..c2d3de7ff 100644
--- a/docs/ci.md
+++ b/docs/ci.md
@@ -8,14 +8,13 @@ To generate this Matrix run `./tests/scripts/md-table/main.py`
|---| --- | --- | --- | --- | --- | --- | --- | --- |
almalinux8 | :white_check_mark: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: | :x: |
amazon | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
-centos7 | :white_check_mark: | :x: | :x: | :white_check_mark: | :x: | :white_check_mark: | :x: | :white_check_mark: |
+centos7 | :white_check_mark: | :white_check_mark: | :x: | :white_check_mark: | :x: | :white_check_mark: | :x: | :white_check_mark: |
debian10 | :white_check_mark: | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: |
debian11 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
debian9 | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: | :x: |
fedora35 | :white_check_mark: | :x: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: |
fedora36 | :x: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: | :x: |
opensuse | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: |
-oracle7 | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: |
rockylinux8 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
ubuntu16 | :x: | :white_check_mark: | :x: | :white_check_mark: | :x: | :white_check_mark: | :x: | :x: |
ubuntu18 | :white_check_mark: | :x: | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :white_check_mark: |
@@ -35,7 +34,6 @@ debian9 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
fedora35 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
fedora36 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
opensuse | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
-oracle7 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
rockylinux8 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
ubuntu16 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
ubuntu18 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
@@ -55,7 +53,6 @@ debian9 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
fedora35 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
fedora36 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: |
opensuse | :x: | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: |
-oracle7 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
rockylinux8 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
ubuntu16 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: |
ubuntu18 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
diff --git a/tests/files/packet_oracle7-canal-ha.yml b/tests/files/packet_centos7-canal-ha.yml
similarity index 85%
rename from tests/files/packet_oracle7-canal-ha.yml
rename to tests/files/packet_centos7-canal-ha.yml
index bedfc46e6..94a5f0e41 100644
--- a/tests/files/packet_oracle7-canal-ha.yml
+++ b/tests/files/packet_centos7-canal-ha.yml
@@ -1,6 +1,6 @@
---
# Instance settings
-cloud_image: oracle-7
+cloud_image: centos-7
mode: ha
# Kubespray settings
--
GitLab