Add more OS Support

wise2c-devops · Sep 30, 2023 · df7518a · df7518a
1 parent 8c19088
commit df7518a
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -17,13 +17,14 @@ jobs:
             curl -L -o ${PWD}/centos8-devel-kubic-libcontainers-stable.repo https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/CentOS_8_Stream/devel:kubic:libcontainers:stable.repo
             curl -L -o ${PWD}/centos8-devel-kubic-libcontainers-stable-cri-o-${CRIO_MAJOR_VERSION}.repo https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/${CRIO_MAJOR_VERSION}/CentOS_8_Stream/devel:kubic:libcontainers:stable:cri-o:${CRIO_MAJOR_VERSION}.repo
             docker run -t --rm -v ${PWD}/rpms:/rpms -v ${PWD}/kubernetes-amd64.repo:/etc/yum.repos.d/kubernetes.repo almalinux:9.2 bash -c \
-              "yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
+              "yum remove -y tar && \
+               yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
                yum install -y https://download.ceph.com/rpm-${CEPH_VERSION}/el9/noarch/ceph-release-1-1.el9.noarch.rpm && \
                yum install -y yum-utils && \
                yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo && \
                mkdir -p /rpms/k8s/centos9 && \
                yum -y install --downloadonly --downloaddir=/rpms/k8s/centos9 docker-ce-${DOCKER_VERSION}.el9 docker-ce-cli-${DOCKER_VERSION}.el9 python3-docker python-chardet python3-requests audit-libs-python3 && \
-               yum -y install --downloadonly --downloaddir=/rpms/k8s/centos9 chrony audit rsync jq git tcpdump nc bind-utils net-tools ipvsadm graphviz && \
+               yum -y install --downloadonly --downloaddir=/rpms/k8s/centos9 tar chrony audit rsync jq git tcpdump nc bind-utils net-tools ipvsadm graphviz && \
                yum -y install --downloadonly --downloaddir=/rpms/k8s/centos9 ceph ceph-radosgw rbd-nbd rbd-mirror open-vm-tools nfs-utils && \
                yum -y install --downloadonly --downloaddir=/rpms/k8s/centos9 kubectl-${KUBE_VERSION} kubelet-${KUBE_VERSION} kubeadm-${KUBE_VERSION} --disableexcludes=kubernetes"
             docker run -t --rm -v ${PWD}/rpms:/rpms -v ${PWD}/centos9-devel-kubic-libcontainers-stable.repo:/etc/yum.repos.d/devel-kubic-libcontainers-stable.repo -v ${PWD}/centos9-devel-kubic-libcontainers-stable-cri-o-${CRIO_MAJOR_VERSION}.repo:/etc/yum.repos.d/devel-kubic-libcontainers-stable-cri-o-${CRIO_MAJOR_VERSION}.repo almalinux:9.2 bash -c \
@@ -35,7 +36,7 @@ jobs:
                yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo && \
                mkdir -p /rpms/k8s/centos8 && \
                yum -y install --downloadonly --downloaddir=/rpms/k8s/centos8 docker-ce-${DOCKER_VERSION}.el8 docker-ce-cli-${DOCKER_VERSION}.el8 python3-docker python3-chardet python3-requests audit-libs-python3 && \
-               yum -y install --downloadonly --downloaddir=/rpms/k8s/centos8 chrony audit rsync jq git tcpdump nc bind-utils net-tools ipvsadm graphviz && \
+               yum -y install --downloadonly --downloaddir=/rpms/k8s/centos8 tar chrony audit rsync jq git tcpdump nc bind-utils net-tools ipvsadm graphviz && \
                yum -y install --downloadonly --downloaddir=/rpms/k8s/centos8 ceph ceph-radosgw rbd-nbd rbd-mirror open-vm-tools nfs-utils && \
                yum -y install --downloadonly --downloaddir=/rpms/k8s/centos8 kubectl-${KUBE_VERSION} kubelet-${KUBE_VERSION} kubeadm-${KUBE_VERSION} --disableexcludes=kubernetes"
             docker run -t --rm -v ${PWD}/rpms:/rpms -v ${PWD}/centos8-devel-kubic-libcontainers-stable.repo:/etc/yum.repos.d/devel-kubic-libcontainers-stable.repo -v ${PWD}/centos8-devel-kubic-libcontainers-stable-cri-o-${CRIO_MAJOR_VERSION}.repo:/etc/yum.repos.d/devel-kubic-libcontainers-stable-cri-o-${CRIO_MAJOR_VERSION}.repo almalinux:8.4 bash -c \
@@ -70,13 +71,14 @@ jobs:
             curl -L -o ${PWD}/centos8-devel-kubic-libcontainers-stable.repo https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/CentOS_8_Stream/devel:kubic:libcontainers:stable.repo
             curl -L -o ${PWD}/centos8-devel-kubic-libcontainers-stable-cri-o-${CRIO_MAJOR_VERSION}.repo https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/${CRIO_MAJOR_VERSION}/CentOS_8_Stream/devel:kubic:libcontainers:stable:cri-o:${CRIO_MAJOR_VERSION}.repo
             docker run -t --rm -v ${PWD}/rpms:/rpms -v ${PWD}/kubernetes-amd64.repo:/etc/yum.repos.d/kubernetes.repo almalinux:9.2 bash -c \
-              "yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
+              "yum remove -y tar && \
+               yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
                yum install -y https://download.ceph.com/rpm-${CEPH_VERSION}/el9/noarch/ceph-release-1-1.el9.noarch.rpm && \
                yum install -y yum-utils && \
                yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo && \
                mkdir -p /rpms/k8s/centos9 && \
                yum -y install --downloadonly --downloaddir=/rpms/k8s/centos9 docker-ce-${DOCKER_VERSION}.el9 docker-ce-cli-${DOCKER_VERSION}.el9 python3-docker python-chardet python3-requests audit-libs-python3 && \
-               yum -y install --downloadonly --downloaddir=/rpms/k8s/centos9 chrony audit rsync jq git tcpdump nc bind-utils net-tools ipvsadm graphviz && \
+               yum -y install --downloadonly --downloaddir=/rpms/k8s/centos9 tar chrony audit rsync jq git tcpdump nc bind-utils net-tools ipvsadm graphviz && \
                yum -y install --downloadonly --downloaddir=/rpms/k8s/centos9 ceph ceph-radosgw rbd-nbd rbd-mirror open-vm-tools nfs-utils && \
                yum -y install --downloadonly --downloaddir=/rpms/k8s/centos9 kubectl-${KUBE_VERSION} kubelet-${KUBE_VERSION} kubeadm-${KUBE_VERSION} --disableexcludes=kubernetes"
             docker run -t --rm -v ${PWD}/rpms:/rpms -v ${PWD}/centos9-devel-kubic-libcontainers-stable.repo:/etc/yum.repos.d/devel-kubic-libcontainers-stable.repo -v ${PWD}/centos9-devel-kubic-libcontainers-stable-cri-o-${CRIO_MAJOR_VERSION}.repo:/etc/yum.repos.d/devel-kubic-libcontainers-stable-cri-o-${CRIO_MAJOR_VERSION}.repo almalinux:9.2 bash -c \
@@ -88,7 +90,7 @@ jobs:
                yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo && \
                mkdir -p /rpms/k8s/centos8 && \
                yum -y install --downloadonly --downloaddir=/rpms/k8s/centos8 docker-ce-${DOCKER_VERSION}.el8 docker-ce-cli-${DOCKER_VERSION}.el8 python3-docker python3-chardet python3-requests audit-libs-python3 && \
-               yum -y install --downloadonly --downloaddir=/rpms/k8s/centos8 chrony audit rsync jq git tcpdump nc bind-utils net-tools ipvsadm graphviz && \
+               yum -y install --downloadonly --downloaddir=/rpms/k8s/centos8 tar chrony audit rsync jq git tcpdump nc bind-utils net-tools ipvsadm graphviz && \
                yum -y install --downloadonly --downloaddir=/rpms/k8s/centos8 ceph ceph-radosgw rbd-nbd rbd-mirror open-vm-tools nfs-utils && \
                yum -y install --downloadonly --downloaddir=/rpms/k8s/centos8 kubectl-${KUBE_VERSION} kubelet-${KUBE_VERSION} kubeadm-${KUBE_VERSION} --disableexcludes=kubernetes"
             docker run -t --rm -v ${PWD}/rpms:/rpms -v ${PWD}/centos8-devel-kubic-libcontainers-stable.repo:/etc/yum.repos.d/devel-kubic-libcontainers-stable.repo -v ${PWD}/centos8-devel-kubic-libcontainers-stable-cri-o-${CRIO_MAJOR_VERSION}.repo:/etc/yum.repos.d/devel-kubic-libcontainers-stable-cri-o-${CRIO_MAJOR_VERSION}.repo almalinux:8.4 bash -c \
@@ -124,13 +126,14 @@ jobs:
             curl -L -o ${PWD}/centos8-devel-kubic-libcontainers-stable.repo https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/CentOS_8_Stream/devel:kubic:libcontainers:stable.repo
             curl -L -o ${PWD}/centos8-devel-kubic-libcontainers-stable-cri-o-${CRIO_MAJOR_VERSION}.repo https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/${CRIO_MAJOR_VERSION}/CentOS_8_Stream/devel:kubic:libcontainers:stable:cri-o:${CRIO_MAJOR_VERSION}.repo
             docker run -t --rm -v ${PWD}/rpms:/rpms -v ${PWD}/kubernetes-aarch64.repo:/etc/yum.repos.d/kubernetes.repo almalinux:9.2 bash -c \
-              "yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
+              "yum remove -y tar && \
+               yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
                yum install -y https://download.ceph.com/rpm-${CEPH_VERSION}/el9/noarch/ceph-release-1-1.el9.noarch.rpm && \
                yum install -y yum-utils && \
                yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo && \
                mkdir -p /rpms/k8s/centos9 && \
                yum -y install --downloadonly --downloaddir=/rpms/k8s/centos9 docker-ce-${DOCKER_VERSION}.el9 docker-ce-cli-${DOCKER_VERSION}.el9 python3-docker python-chardet python3-requests audit-libs-python3 && \
-               yum -y install --downloadonly --downloaddir=/rpms/k8s/centos9 chrony audit rsync jq git tcpdump nc bind-utils net-tools ipvsadm graphviz && \
+               yum -y install --downloadonly --downloaddir=/rpms/k8s/centos9 tar chrony audit rsync jq git tcpdump nc bind-utils net-tools ipvsadm graphviz && \
                yum -y install --downloadonly --downloaddir=/rpms/k8s/centos9 open-vm-tools nfs-utils && \
                yum -y install --downloadonly --downloaddir=/rpms/k8s/centos9 kubectl-${KUBE_VERSION} kubelet-${KUBE_VERSION} kubeadm-${KUBE_VERSION} --disableexcludes=kubernetes"
             docker run -t --rm -v ${PWD}/rpms:/rpms -v ${PWD}/centos9-devel-kubic-libcontainers-stable.repo:/etc/yum.repos.d/devel-kubic-libcontainers-stable.repo -v ${PWD}/centos9-devel-kubic-libcontainers-stable-cri-o-${CRIO_MAJOR_VERSION}.repo:/etc/yum.repos.d/devel-kubic-libcontainers-stable-cri-o-${CRIO_MAJOR_VERSION}.repo almalinux:9.2 bash -c \
@@ -142,7 +145,7 @@ jobs:
                yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo && \
                mkdir -p /rpms/k8s/centos8 && \
                yum -y install --downloadonly --downloaddir=/rpms/k8s/centos8 docker-ce-${DOCKER_VERSION}.el8 docker-ce-cli-${DOCKER_VERSION}.el8 python3-docker python3-chardet python3-requests audit-libs-python3 && \
-               yum -y install --downloadonly --downloaddir=/rpms/k8s/centos8 chrony audit rsync jq git tcpdump nc bind-utils net-tools ipvsadm graphviz && \
+               yum -y install --downloadonly --downloaddir=/rpms/k8s/centos8 tar chrony audit rsync jq git tcpdump nc bind-utils net-tools ipvsadm graphviz && \
                yum -y install --downloadonly --downloaddir=/rpms/k8s/centos8 nfs-utils && \
                yum -y install --downloadonly --downloaddir=/rpms/k8s/centos8 kubectl-${KUBE_VERSION} kubelet-${KUBE_VERSION} kubeadm-${KUBE_VERSION} --disableexcludes=kubernetes"
             docker run -t --rm -v ${PWD}/rpms:/rpms -v ${PWD}/centos8-devel-kubic-libcontainers-stable.repo:/etc/yum.repos.d/devel-kubic-libcontainers-stable.repo -v ${PWD}/centos8-devel-kubic-libcontainers-stable-cri-o-${CRIO_MAJOR_VERSION}.repo:/etc/yum.repos.d/devel-kubic-libcontainers-stable-cri-o-${CRIO_MAJOR_VERSION}.repo almalinux:8.4 bash -c \
@@ -178,13 +181,14 @@ jobs:
             curl -L -o ${PWD}/centos8-devel-kubic-libcontainers-stable.repo https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/CentOS_8_Stream/devel:kubic:libcontainers:stable.repo
             curl -L -o ${PWD}/centos8-devel-kubic-libcontainers-stable-cri-o-${CRIO_MAJOR_VERSION}.repo https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/${CRIO_MAJOR_VERSION}/CentOS_8_Stream/devel:kubic:libcontainers:stable:cri-o:${CRIO_MAJOR_VERSION}.repo
             docker run -t --rm -v ${PWD}/rpms:/rpms -v ${PWD}/kubernetes-aarch64.repo:/etc/yum.repos.d/kubernetes.repo almalinux:9.2 bash -c \
-              "yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
+              "yum remove -y tar && \
+               yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
                yum install -y https://download.ceph.com/rpm-${CEPH_VERSION}/el9/noarch/ceph-release-1-1.el9.noarch.rpm && \
                yum install -y yum-utils && \
                yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo && \
                mkdir -p /rpms/k8s/centos9 && \
                yum -y install --downloadonly --downloaddir=/rpms/k8s/centos9 docker-ce-${DOCKER_VERSION}.el9 docker-ce-cli-${DOCKER_VERSION}.el9 python3-docker python-chardet python3-requests audit-libs-python3 && \
-               yum -y install --downloadonly --downloaddir=/rpms/k8s/centos9 chrony audit rsync jq git tcpdump nc bind-utils net-tools ipvsadm graphviz && \
+               yum -y install --downloadonly --downloaddir=/rpms/k8s/centos9 tar chrony audit rsync jq git tcpdump nc bind-utils net-tools ipvsadm graphviz && \
                yum -y install --downloadonly --downloaddir=/rpms/k8s/centos9 open-vm-tools nfs-utils && \
                yum -y install --downloadonly --downloaddir=/rpms/k8s/centos9 kubectl-${KUBE_VERSION} kubelet-${KUBE_VERSION} kubeadm-${KUBE_VERSION} --disableexcludes=kubernetes"
             docker run -t --rm -v ${PWD}/rpms:/rpms -v ${PWD}/centos9-devel-kubic-libcontainers-stable.repo:/etc/yum.repos.d/devel-kubic-libcontainers-stable.repo -v ${PWD}/centos9-devel-kubic-libcontainers-stable-cri-o-${CRIO_MAJOR_VERSION}.repo:/etc/yum.repos.d/devel-kubic-libcontainers-stable-cri-o-${CRIO_MAJOR_VERSION}.repo almalinux:9.2 bash -c \
@@ -196,7 +200,7 @@ jobs:
                yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo && \
                mkdir -p /rpms/k8s/centos8 && \
                yum -y install --downloadonly --downloaddir=/rpms/k8s/centos8 docker-ce-${DOCKER_VERSION}.el8 docker-ce-cli-${DOCKER_VERSION}.el8 python3-docker python3-chardet python3-requests audit-libs-python3 && \
-               yum -y install --downloadonly --downloaddir=/rpms/k8s/centos8 chrony audit rsync jq git tcpdump nc bind-utils net-tools ipvsadm graphviz && \
+               yum -y install --downloadonly --downloaddir=/rpms/k8s/centos8 tar chrony audit rsync jq git tcpdump nc bind-utils net-tools ipvsadm graphviz && \
                yum -y install --downloadonly --downloaddir=/rpms/k8s/centos8 nfs-utils && \
                yum -y install --downloadonly --downloaddir=/rpms/k8s/centos8 kubectl-${KUBE_VERSION} kubelet-${KUBE_VERSION} kubeadm-${KUBE_VERSION} --disableexcludes=kubernetes"
             docker run -t --rm -v ${PWD}/rpms:/rpms -v ${PWD}/centos8-devel-kubic-libcontainers-stable.repo:/etc/yum.repos.d/devel-kubic-libcontainers-stable.repo -v ${PWD}/centos8-devel-kubic-libcontainers-stable-cri-o-${CRIO_MAJOR_VERSION}.repo:/etc/yum.repos.d/devel-kubic-libcontainers-stable-cri-o-${CRIO_MAJOR_VERSION}.repo almalinux:8.4 bash -c \