gfwleak/tsg-tsg-os-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feature:删除rockylinux安装指定版本的ansible

Browse Source
This commit is contained in:
fumingwei
2022-12-04 18:22:55 +08:00
parent 6b63e6598a
commit 8d14409013
2 changed files with 1 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
.gitlab-ci.yml
View File

@@ -73,8 +73,6 @@ feature_branch_build_TSGXP0804:
variables:
PROFILE_LIST: TSGXNXR620G40R01P0804
DALIY_BUILD_VERSION: 1
before_script:
- yum -y install https://mirrors.aliyun.com/rockylinux/8.6/AppStream/x86_64/os/Packages/a/ansible-core-2.12.2-4.el8_6.rocky.0.1.x86_64.rpm
except:
- tags
- /^dev-.*$/i
@@ -88,8 +86,6 @@ feature_branch_build_TSGXP0906:
variables:
PROFILE_LIST: TSGXNXR620G40R01P0906
DALIY_BUILD_VERSION: 1
before_script:
- yum -y install https://mirrors.aliyun.com/rockylinux/8.6/AppStream/x86_64/os/Packages/a/ansible-core-2.12.2-4.el8_6.rocky.0.1.x86_64.rpm
except:
- tags
- /^dev-.*$/i
@@ -191,8 +187,6 @@ develop_build_TSGXP0804:
PULP3_FILE_DIST_NAME: tsg-os-images-develop
DALIY_BUILD_VERSION: 1
FILE_REPO_PATH: install/develop/tsg-os-images
before_script:
- yum -y install https://mirrors.aliyun.com/rockylinux/8.6/AppStream/x86_64/os/Packages/a/ansible-core-2.12.2-4.el8_6.rocky.0.1.x86_64.rpm
only:
- /^dev-.*$/i
@@ -207,8 +201,6 @@ develop_build_TSGXP0906:
PULP3_FILE_DIST_NAME: tsg-os-images-develop
DALIY_BUILD_VERSION: 1
FILE_REPO_PATH: install/develop/tsg-os-images
before_script:
- yum -y install https://mirrors.aliyun.com/rockylinux/8.6/AppStream/x86_64/os/Packages/a/ansible-core-2.12.2-4.el8_6.rocky.0.1.x86_64.rpm
only:
- /^dev-.*$/i
@@ -309,8 +301,6 @@ testing_build_TSGXP0804:
PULP3_FILE_DIST_NAME: tsg-os-images-testing
FILE_REPO_PATH: install/testing/tsg-os-images
DALIY_BUILD_VERSION: 1
before_script:
- yum -y install https://mirrors.aliyun.com/rockylinux/8.6/AppStream/x86_64/os/Packages/a/ansible-core-2.12.2-4.el8_6.rocky.0.1.x86_64.rpm
only:
- /^rel-.*$/i
@@ -325,8 +315,6 @@ testing_build_TSGXP0906:
PULP3_FILE_DIST_NAME: tsg-os-images-testing
FILE_REPO_PATH: install/testing/tsg-os-images
DALIY_BUILD_VERSION: 1
before_script:
- yum -y install https://mirrors.aliyun.com/rockylinux/8.6/AppStream/x86_64/os/Packages/a/ansible-core-2.12.2-4.el8_6.rocky.0.1.x86_64.rpm
only:
- /^rel-.*$/i
@@ -427,8 +415,6 @@ rc_build_TSGXP0804:
PULP3_FILE_REPO_NAME: tsg-os-images-rc
PULP3_FILE_DIST_NAME: tsg-os-images-rc
FILE_REPO_PATH: install/rc/tsg-os-images
before_script:
- yum -y install https://mirrors.aliyun.com/rockylinux/8.6/AppStream/x86_64/os/Packages/a/ansible-core-2.12.2-4.el8_6.rocky.0.1.x86_64.rpm
only:
- /^.*-rc.*$/i
@@ -443,8 +429,6 @@ rc_build_TSGXP0906:
PULP3_FILE_REPO_NAME: tsg-os-images-rc
PULP3_FILE_DIST_NAME: tsg-os-images-rc
FILE_REPO_PATH: install/rc/tsg-os-images
before_script:
- yum -y install https://mirrors.aliyun.com/rockylinux/8.6/AppStream/x86_64/os/Packages/a/ansible-core-2.12.2-4.el8_6.rocky.0.1.x86_64.rpm
only:
- /^.*-rc.*$/i
@@ -553,8 +537,6 @@ release_build_TSGXP0804:
PULP3_FILE_REPO_NAME: tsg-os-images-release
PULP3_FILE_DIST_NAME: tsg-os-images-release
FILE_REPO_PATH: install/release/tsg-os-images
before_script:
- yum -y install https://mirrors.aliyun.com/rockylinux/8.6/AppStream/x86_64/os/Packages/a/ansible-core-2.12.2-4.el8_6.rocky.0.1.x86_64.rpm
only:
- tags
except:
@@ -571,8 +553,6 @@ release_build_TSGXP0906:
PULP3_FILE_REPO_NAME: tsg-os-images-release
PULP3_FILE_DIST_NAME: tsg-os-images-release
FILE_REPO_PATH: install/release/tsg-os-images
before_script:
- yum -y install https://mirrors.aliyun.com/rockylinux/8.6/AppStream/x86_64/os/Packages/a/ansible-core-2.12.2-4.el8_6.rocky.0.1.x86_64.rpm
only:
- tags
except:

11
tools/mk-base-image
View File

@@ -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 yum-utils ipmitool OpenIPMI docker-ce docker-ce-cli
nscd nss-pam-ldapd grub2 epel-release efibootmgr ansible 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++
@@ -70,15 +70,6 @@ yum -c "$yum_config" --installroot="$target" -y makecache
yum -c "$yum_config" --installroot="$target" -y --setopt=$setopt install $base_package_to_install
yum -c "$yum_config" --installroot="$target" -y --setopt=$setopt install $append_package_to_install
case $profile_id in
"TSG-X-NXR620G40-R01-P0804" | "TSG-X-NXR620G40-R01-P0906" )
yum -y install https://mirrors.aliyun.com/rockylinux/8.6/AppStream/x86_64/os/Packages/a/ansible-core-2.12.2-4.el8_6.rocky.0.1.x86_64.rpm --installroot="$target"
yum -c "$yum_config" --installroot="$target" -y --setopt=$setopt install ansible
;;
*)
echo "Nothing to do profile_id:$profile_id"
;;
esac
#if [ $profile_id == "TSG-X-NXR620G40-R01-P0804" ];then
# kernel_version=$(ls $target/boot/vmlinuz-*.x86_64 | grep -oP "^$target/boot/vmlinuz-\K.*")