From 3aea5cd0e2b928260ffb56dce0fb3cbfb31cc37e Mon Sep 17 00:00:00 2001 From: fumingwei Date: Mon, 22 May 2023 11:59:39 +0800 Subject: [PATCH] =?UTF-8?q?bugfix:=E4=BF=AE=E6=94=B9rockylinux8=20ansible?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E6=96=B9=E5=BC=8F=E7=94=B1rpm=E6=94=B9?= =?UTF-8?q?=E4=B8=BApip=E5=AE=89=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 6 ++++-- tools/mk-base-image | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6880f226..a93b513e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,7 +22,8 @@ stages: .build_tsg-buildimage-p0906: script: - env | sort - - yum -y install pbzip2 ansible + - yum -y install pbzip2 python39 + - python3.9 -m pip install -i https://pypi.tuna.tsinghua.edu.cn/simple ansible - make DALIY_BUILD_VERSION=$DALIY_BUILD_VERSION - chmod +x ./tools/upload.sh - ./tools/upload.sh @@ -33,7 +34,8 @@ stages: script: - env | sort - yum -y remove docker-ce - - yum -y install pbzip2 ansible buildah podman + - yum -y install pbzip2 buildah podman python39 + - python3.9 -m pip install -i https://pypi.tuna.tsinghua.edu.cn/simple ansible - make DALIY_BUILD_VERSION=$DALIY_BUILD_VERSION - chmod +x ./tools/upload.sh - ./tools/upload.sh diff --git a/tools/mk-base-image b/tools/mk-base-image index 95e2bc0e..48786d0c 100755 --- a/tools/mk-base-image +++ b/tools/mk-base-image @@ -43,7 +43,7 @@ case $profile_id in base_package_to_install="@base @core @debugging @anaconda-tools @additional-devel @guest-agents @system-tools @hardware-monitoring @network-file-system-client @performance @remote-system-management adcli certmonger ipa-client clevis-dracut clevis-udisks2 krb5-pkinit krb5-workstation sssd-polkit-rules krb5-pkinit luksmeta - nscd nss-pam-ldapd grub2 epel-release efibootmgr ansible yum-utils ipmitool OpenIPMI docker-ce docker-ce-cli + nscd nss-pam-ldapd grub2 epel-release efibootmgr yum-utils ipmitool OpenIPMI docker-ce docker-ce-cli containerd.io lrzsz python3 watchdog pcm git tmux fish kernel kernel-devel kernel-tools-libs kernel-modules kernel-tools kernel-core rpm-build libtool kernel-rpm-macros python36-devel tcsh kernel-modules-extra gcc-gfortran libdb-devel fuse-devel python3-Cython cmake perl-generators libstdc++-devel libmnl-devel bison flex gcc-c++