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

feature:TSG-17838:安装xmlstarlet,修改TSG-X镜像名称后缀为x86_64_COTS.

Browse Source
This commit is contained in:
fumingwei
2023-12-11 11:54:56 +08:00
parent 5e3349ce45
commit 18b4068626
16 changed files with 95 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
.gitlab-ci.yml
View File

@@ -103,7 +103,7 @@ feature_branch_build_container_images_TSGXP0906:
stage: build
extends: .build_tsg-build-container-images
variables:
PROFILE_LIST: TSGXBUILDCONTAINERP0906
PROFILE_LIST: x86_64_COTS_APP_BUNDLE
DALIY_BUILD_VERSION: 1
ENABLE_LICENSE_PROTECTED: 0
ENABLE_ALIYUN_INTERNAL_DOMAIN: 1
@@ -124,7 +124,7 @@ feature_branch_build_TSGXP0906:
extends: .build_tsg-buildimage-p0906
needs: ["feature_branch_build_container_images_TSGXP0906"]
variables:
PROFILE_LIST: TSGXNXR620G40R01P0906
PROFILE_LIST: x86_64_COTS
DALIY_BUILD_VERSION: 1
ENABLE_ALIYUN_INTERNAL_DOMAIN: 1
cache:
@@ -183,7 +183,7 @@ develop_build_container_images_TSGXP0906:
stage: build
extends: .build_tsg-build-container-images
variables:
PROFILE_LIST: TSGXBUILDCONTAINERP0906
PROFILE_LIST: x86_64_COTS_APP_BUNDLE
UPLOAD_TO_FILE_REPO: 1
PULP3_FILE_REPO_NAME: tsg-os-images-develop
PULP3_FILE_DIST_NAME: tsg-os-images-develop
@@ -205,7 +205,7 @@ develop_build_TSGXP0906:
extends: .build_tsg-buildimage-p0906
needs: ["develop_build_container_images_TSGXP0906"]
variables:
PROFILE_LIST: TSGXNXR620G40R01P0906
PROFILE_LIST: x86_64_COTS
UPLOAD_TO_FILE_REPO: 1
PULP3_FILE_REPO_NAME: tsg-os-images-develop
PULP3_FILE_DIST_NAME: tsg-os-images-develop
@@ -267,7 +267,7 @@ testing_build_container_images_TSGXP0906:
stage: build
extends: .build_tsg-build-container-images
variables:
PROFILE_LIST: TSGXBUILDCONTAINERP0906
PROFILE_LIST: x86_64_COTS_APP_BUNDLE
UPLOAD_TO_FILE_REPO: 1
PULP3_FILE_REPO_NAME: tsg-os-images-testing
PULP3_FILE_DIST_NAME: tsg-os-images-testing
@@ -289,7 +289,7 @@ testing_build_TSGXP0906:
needs: ["testing_build_container_images_TSGXP0906"]
extends: .build_tsg-buildimage-p0906
variables:
PROFILE_LIST: TSGXNXR620G40R01P0906
PROFILE_LIST: x86_64_COTS
UPLOAD_TO_FILE_REPO: 1
PULP3_FILE_REPO_NAME: tsg-os-images-testing
PULP3_FILE_DIST_NAME: tsg-os-images-testing
@@ -351,7 +351,7 @@ rc_build_container_images_TSGXP0906:
stage: build
extends: .build_tsg-build-container-images
variables:
PROFILE_LIST: TSGXBUILDCONTAINERP0906
PROFILE_LIST: x86_64_COTS_APP_BUNDLE
UPLOAD_TO_FILE_REPO: 1
DALIY_BUILD_VERSION: 0
PULP3_FILE_REPO_NAME: tsg-os-images-rc
@@ -373,7 +373,7 @@ rc_build_TSGXP0906:
extends: .build_tsg-buildimage-p0906
needs: ["rc_build_container_images_TSGXP0906"]
variables:
PROFILE_LIST: TSGXNXR620G40R01P0906
PROFILE_LIST: x86_64_COTS
UPLOAD_TO_FILE_REPO: 1
DALIY_BUILD_VERSION: 0
PULP3_FILE_REPO_NAME: tsg-os-images-rc
@@ -439,7 +439,7 @@ release_build_container_images_TSGXP0906:
stage: build
extends: .build_tsg-build-container-images
variables:
PROFILE_LIST: TSGXBUILDCONTAINERP0906
PROFILE_LIST: x86_64_COTS_APP_BUNDLE
UPLOAD_TO_FILE_REPO: 1
DALIY_BUILD_VERSION: 0
PULP3_FILE_REPO_NAME: tsg-os-images-release
@@ -463,7 +463,7 @@ release_build_TSGXP0906:
extends: .build_tsg-buildimage-p0906
needs: ["release_build_container_images_TSGXP0906"]
variables:
PROFILE_LIST: TSGXNXR620G40R01P0906
PROFILE_LIST: x86_64_COTS
UPLOAD_TO_FILE_REPO: 1
DALIY_BUILD_VERSION: 0
PULP3_FILE_REPO_NAME: tsg-os-images-release

52
ansible/HAL_deploy.yml
View File

@@ -50,10 +50,10 @@
- {role: system-init, tags: system-init}
- {role: hasp, tags: hasp}
- hosts: TSG-X-NXR620G40-R01-P0906
- hosts: x86_64_COTS
remote_user: root
vars_files:
- install_config/group_vars/HAL_TSGXNXR620G40R01P0906.yml
- install_config/group_vars/HAL_x86_64_COTS.yml
- install_config/group_vars/rpm_version.yml
roles:
- {role: k3s-install, tags: k3s-install}
@@ -79,18 +79,18 @@
- {role: tuned, tags: tuned}
- {role: patches-9000-NPB, tags: patches-9000-NPB}
- hosts: TSG-X-NXR620G40-R01-P0906-init
- hosts: x86_64_COTS-init
remote_user: root
vars_files:
- install_config/group_vars/HAL_TSGXNXR620G40R01P0906.yml
- install_config/group_vars/HAL_x86_64_COTS.yml
- install_config/group_vars/rpm_version.yml
roles:
- {role: tsg_sn, tags: tsg_sn}
- hosts: TSG-X-NXR620G40-R01-P0906-firewall
- hosts: x86_64_COTS-firewall
remote_user: root
vars_files:
- install_config/group_vars/HAL_TSGXNXR620G40R01P0906.yml
- install_config/group_vars/HAL_x86_64_COTS.yml
- install_config/group_vars/rpm_version.yml
roles:
- {role: framework, tags: framework}
@@ -102,93 +102,93 @@
- {role: wire_graft, tags: wire_graft}
- {role: hasp, tags: hasp}
- hosts: TSG-X-NXR620G40-R01-P0906-proxy
- hosts: x86_64_COTS-proxy
remote_user: root
vars_files:
- install_config/group_vars/HAL_TSGXNXR620G40R01P0906.yml
- install_config/group_vars/HAL_x86_64_COTS.yml
- install_config/group_vars/rpm_version.yml
roles:
- {role: framework, tags: framework}
- {role: tfe, tags: tfe}
- {role: hasp, tags: hasp}
- hosts: TSG-X-NXR620G40-R01-P0906-certstore
- hosts: x86_64_COTS-certstore
remote_user: root
vars_files:
- install_config/group_vars/HAL_TSGXNXR620G40R01P0906.yml
- install_config/group_vars/HAL_x86_64_COTS.yml
- install_config/group_vars/rpm_version.yml
roles:
- {role: framework, tags: framework}
- {role: redis, tags: redis}
- {role: certstore, tags: certstore}
- hosts: TSG-X-NXR620G40-R01-P0906-telegraf
- hosts: x86_64_COTS-telegraf
remote_user: root
vars_files:
- install_config/group_vars/HAL_TSGXNXR620G40R01P0906.yml
- install_config/group_vars/HAL_x86_64_COTS.yml
- install_config/group_vars/rpm_version.yml
roles:
- {role: telegraf_statistic, tags: telegraf_statistic}
- hosts: TSG-X-NXR620G40-R01-P0906-sce
- hosts: x86_64_COTS-sce
remote_user: root
vars_files:
- install_config/group_vars/HAL_TSGXNXR620G40R01P0906.yml
- install_config/group_vars/HAL_x86_64_COTS.yml
- install_config/group_vars/rpm_version.yml
roles:
- {role: framework, tags: framework}
- {role: sce, tags: sce}
- {role: hasp, tags: hasp}
- hosts: TSG-X-NXR620G40-R01-P0906-bfdd
- hosts: x86_64_COTS-bfdd
remote_user: root
vars_files:
- install_config/group_vars/HAL_TSGXNXR620G40R01P0906.yml
- install_config/group_vars/HAL_x86_64_COTS.yml
- install_config/group_vars/rpm_version.yml
roles:
- {role: framework, tags: framework}
- {role: bfdd, tags: bfdd}
- hosts: TSG-X-NXR620G40-R01-P0906-shaping
- hosts: x86_64_COTS-shaping
remote_user: root
vars_files:
- install_config/group_vars/HAL_TSGXNXR620G40R01P0906.yml
- install_config/group_vars/HAL_x86_64_COTS.yml
- install_config/group_vars/rpm_version.yml
roles:
- {role: framework, tags: framework}
- {role: shaping_engine, tags: shaping_engine}
- hosts: TSG-X-NXR620G40-R01-P0906-inject
- hosts: x86_64_COTS-inject
remote_user: root
vars_files:
- install_config/group_vars/HAL_TSGXNXR620G40R01P0906.yml
- install_config/group_vars/HAL_x86_64_COTS.yml
- install_config/group_vars/rpm_version.yml
roles:
- {role: framework, tags: framework}
- {role: packet_adapter, tags: packet_adapter}
- hosts: TSG-X-NXR620G40-R01-P0906-packet-io-engine
- hosts: x86_64_COTS-packet-io-engine
remote_user: root
vars_files:
- install_config/group_vars/HAL_TSGXNXR620G40R01P0906.yml
- install_config/group_vars/HAL_x86_64_COTS.yml
- install_config/group_vars/rpm_version.yml
roles:
- {role: framework, tags: framework}
- {role: mrzcpd, tags: mrzcpd}
- {role: confd, tags: confd}
- hosts: TSG-X-NXR620G40-R01-P0906-base
- hosts: x86_64_COTS-base
remote_user: root
vars_files:
- install_config/group_vars/HAL_TSGXNXR620G40R01P0906.yml
- install_config/group_vars/HAL_x86_64_COTS.yml
- install_config/group_vars/rpm_version.yml
roles:
- {role: container-tools-install, tags: container-tools-install}
- hosts: TSG-X-NXR620G40-R01-P0906-packet-io-engine-deviceplugin
- hosts: x86_64_COTS-packet-io-engine-deviceplugin
remote_user: root
vars_files:
- install_config/group_vars/HAL_TSGXNXR620G40R01P0906.yml
- install_config/group_vars/HAL_x86_64_COTS.yml
- install_config/group_vars/rpm_version.yml
roles:
- {role: framework, tags: framework}

60
ansible/install_config/group_vars/HAL_9000NPBP01R01.yml
View File

@@ -1,60 +0,0 @@
# TOD: TSG-6386 调整 TSG-OS 中的脚本， 适配 TSG-9140 硬件平台
# variable format {role_name}.{configname}.{section}.{var} configname 用 "_" 替代 "."
control_and_policy:
nic_name: eth_vf_ctl
workload_zcpd:
cpu_affinity: 1,2,3,4
hugepage_num_1G: 16
dp_traffic_mirror:
nic_name: eth_vf_mirr
traffic_mirror_vlan_id: 2
workload_firewall:
cpu_affinity: 5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47
worker_threads: 43
send_only_threads_max: 0
dp_steering_firewall:
deployment: inline
encapsulation: vxlan
capture_packet: driver
nic_internal: eth_vf_raw
enable_mirror: 1
diagnose:
virtual_server_nic: eth_vf_dign_s
virtual_client_nic: eth_vf_dign_c
prefix_path:
mrzcpd: /opt/tsg/mrzcpd
framework: /opt/tsg/framework
sapp: /opt/tsg/sapp
dp_steering_proxy:
###### location: value {local, foreign}
location: local
node_list:
- nic_name: eth_vf_kni
workload_proxy:
enable_cpu_affinity: 1
cpu_affinity: 48-55
worker_thread: 7
dp_proxy:
nic_name_data_incoming: eth_vf_tfe
mac_addr_data_incoming: 00:0e:c6:d6:72:c1
enable_traffic_mirror: 1
traffic_mirror_type: 1
dp_certstore:
location: local
monitor:
enable_redis_exporter: 0
enable_ipmi_exporter: 0
runtime_env: TSG-9140

0
ansible/install_config/group_vars/HAL_TSGXNXR620G40R01P0906.yml → ansible/install_config/group_vars/HAL_x86_64_COTS.yml
View File

2
ansible/roles/certstore/tasks/main.yml
View File

@@ -97,7 +97,7 @@
path: "/etc/cert-redis.conf"
regexp: 'daemonize yes'
replace: 'daemonize no'
when: runtime_env == 'TSG-X-P0906' and PROFILE_ID == 'TSG-X-NXR620G40-R01-P0906-certstore'
when: runtime_env == 'TSG-X-P0906'
##################### certstore #####################
- name: "start certstore"

13
ansible/roles/patches-9000-NPB/files/install.sh
View File

@@ -15,8 +15,8 @@ function install_patch_files()
cp $UNARCHIVE_DIR/90-9000NPBP01R01.rules /usr/lib/udev/rules.d/90-9000NPBP01R01.rules
cp $UNARCHIVE_DIR/ifcfg-eth_pf_smbio /etc/sysconfig/network-scripts/ifcfg-eth_pf_smbio
cp $UNARCHIVE_DIR/set-eth_pf_smbio-macaddr.sh /usr/bin/set-eth_pf_smbio-macaddr.sh
chmod 0777 /usr/bin/set-eth_pf_smbio-macaddr.sh
cp $UNARCHIVE_DIR/nm_pre-up_set_eth_pf_smbio_macaddr.sh /usr/lib/NetworkManager/dispatcher.d/pre-up.d/01-set_eth_pf_smbio_macaddr.sh
chmod 0755 /usr/lib/NetworkManager/dispatcher.d/pre-up.d/01-set_eth_pf_smbio_macaddr.sh
cp $UNARCHIVE_DIR/ifcfg-eth_pf_smbcx /etc/sysconfig/network-scripts/ifcfg-eth_pf_smbcx
cp $UNARCHIVE_DIR/ifcfg-eth_vf_mirr /etc/sysconfig/network-scripts/ifcfg-eth_vf_mirr
@@ -46,6 +46,9 @@ function install_patch_files()
mkdir -p /opt/tsg/clixon/bin
cp $UNARCHIVE_DIR/set_9000_NPB_running_db.sh /opt/tsg/clixon/bin/set_9000_NPB_running_db.sh
chmod 0755 /opt/tsg/clixon/bin/set_9000_NPB_running_db.sh
mkdir -p /opt/tsg/clixon/yang
cp /opt/tsg/clixon/deviation/tsg-os-mgnt-augment-9000-NPB.yang /opt/tsg/clixon/yang/tsg-os-mgnt-augment-9000-NPB.yang
}
function set_HAL_config()
@@ -53,11 +56,11 @@ function set_HAL_config()
HAL_config="/etc/sysconfig/tsg-os-HAL.conf"
# mrzcpd affinity cpu core
sed -i 's/.*IOCORE=*/IOCORE=1-4/' $HAL_config
sed -i '/IOCORE=/c\IOCORE=1-4' $HAL_config
# vsys affinity cpu core
sed -i 's/.*WORKLOAD_CORE=*/WORKLOAD_CORE=5-55/' $HAL_config
sed -i '/WORKLOAD_CORE=/c\WORKLOAD_CORE=5-55' $HAL_config
# deafault memory hugepages number.
sed -i 's/.*HUGEPAGES=*/HUGEPAGES=16/' $HAL_config
sed -i '/HUGEPAGES=/c\HUGEPAGES=16' $HAL_config
}
function clean_unarchive_dir()

5
ansible/roles/patches-9000-NPB/files/patch/90-9000NPBP01R01.rules
View File

@@ -1,11 +1,10 @@
ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:01:00.0", NAME:="eth_pf_smbio"
ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:01:00.0",RUN+="/usr/bin/set-eth_pf_smbio-macaddr.sh"
ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:82:00.0", NAME:="eth_pf_smbcx"
ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:82:00.0",ATTR{device/sriov_numvfs}="2"
ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:82:00.0",ATTR{/device/sriov/0/max_tx_rate}="20480"
ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:82:00.0",ATTR{/device/sriov/1/max_tx_rate}="20480"
ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:82:02.0", NAME:="eth_vf_mirr"
ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:82:02.1", NAME:="eth_vf_ctl"
ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:82:02.0",PROGRAM+="/usr/sbin/ip link set eth_pf_smbcx vf 0 rate 20480"
ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:82:02.1",PROGRAM+="/usr/sbin/ip link set eth_pf_smbcx vf 1 rate 20480"
ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:82:02.1",PROGRAM+="/usr/sbin/ip link set eth_pf_smbcx vf 1 vlan 3817"
ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:82:02.0",PROGRAM+="/usr/sbin/ip link set eth_pf_smbcx vf 0 trust on"
ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:82:02.1",PROGRAM+="/usr/sbin/ip link set eth_pf_smbcx vf 1 trust on"

18
ansible/roles/patches-9000-NPB/files/patch/nm_pre-up_set_eth_pf_smbio_macaddr.sh Normal file
View File

@@ -0,0 +1,18 @@
#!/bin/sh
INTERFACE="$1"
ACTION="$2"
MAC_6TH_OCTET=
read_mac_6th_octet()
{
output=$(ipmitool picmg addrinfo)
MAC_6TH_OCTET=${output:21:2}
}
if [[ $INTERFACE == "eth_pf_smbio" ]] && [[ $ACTION == "pre-up" ]]
then
logger "NetworkManager Dispather Scripts: $0, Interface: $INTERFACE, action: $ACTION"
read_mac_6th_octet
macaddr="90:00:00:91:40:$MAC_6TH_OCTET"
ip link set eth_pf_smbio address $macaddr
fi

11
ansible/roles/patches-9000-NPB/files/patch/set-eth_pf_smbio-macaddr.sh
View File

@@ -1,11 +0,0 @@
#!/bin/sh
NIC_NAME="eth_pf_smbio"
echo -------------------- set $NIC_NAME macaddr --------------------
output=$(ipmitool picmg addrinfo)
echo $output
substr=${output:21:2}
echo deviceid:$substr
macaddr='90:00:00:91:40:'$substr
echo $NIC_NAME macaddr:$macaddr
ip link set dev $NIC_NAME address $macaddr

5
ansible/roles/patches-9000-NPB/files/patch/set_9000_NPB_running_db.sh
View File

@@ -35,8 +35,9 @@ add_network_into_running_db()
</network>"
#xmlstarlet ed --omit-decl -s "/config" -t text -n '' -v "$(xmlstarlet sel -t -c '/config/*' 2.xml)" 1.xml | xmlstarlet unesc | xmlstarlet fo --omit-decl > 3.xml
#$network | xmlstarlet sel -t -c '/config/*'
xml_content=$(xmlstarlet ed --omit-decl -s "/config" -t text -n '' -v "${network}" ${RUNNING_DB_FILE} | xmlstarlet unesc)
echo ${xml_content} | xmlstarlet fo --omit-decl > ${RUNNING_DB_FILE}
xml_content=$(xmlstarlet ed -s "/config" -t text -n '' -v "${network}" ${RUNNING_DB_FILE} | xmlstarlet unesc)
echo ${xml_content} | xmlstarlet fo > ${RUNNING_DB_FILE}
sed -i '/<?xml version="1.0"?>/d' ${RUNNING_DB_FILE}
}
is_network_in_running_db()

13
ansible/roles/tsg_sn/files/read_sn_to_env.sh
View File

@@ -4,12 +4,15 @@ SN=
function read_device_type()
{
product_name_9000_NPB=("ACB300")
product_name=`ipmitool fru list | grep 'Product Name' | awk '{print $4}'`
product_name=`ipmitool fru list | grep 'Board Product' | awk '{print $4}'`
if [[ "${product_name_9000_NPB[@]}" =~ "${product_name}" ]]; then
DEVICE_TYPE="9000-NPB"
fi
case ${product_name} in
"ACB300-040-00" | "9000-NPB-P01R01")
DEVICE_TYPE="9000-NPB"
;;
*)
;;
esac
}
function read_sn()

13
installer/install.sh
View File

@@ -215,10 +215,15 @@ install_uefi_grub()
DEVICE_TYPE=
read_device_type()
{
product_name=`ipmitool fru list | grep 'Board Product' | awk '{print $4}'`
if [[ "${product_name}" == "ACB300" ]]; then
DEVICE_TYPE="9000-NPB"
fi
product_name=`ipmitool fru list | grep 'Product Name' | awk '{print $4}'`
case ${product_name} in
"ACB300-040-00" | "9000-NPB-P01R01")
DEVICE_TYPE="9000-NPB"
;;
*)
;;
esac
}
install_patches()

4
make/Makefile.TSGXNXR620G40R01P0906 → make/Makefile.x86_64_COTS
View File

@@ -1,6 +1,6 @@
PROFILE_ID := TSG-X-NXR620G40-R01-P0906
SUPPORTED_MACHINE_ID := TSG-X-NXR620G40-R01-P0906
PROFILE_ID := x86_64_COTS
SUPPORTED_MACHINE_ID := x86_64_COTS
KERNEL_ARGS := crashkernel=512M default_hugepagesz=1G intel_iommu=on iommu=pt mitigations=off psi=1 selinux=0 quiet splash transparent_hugepage=never processor.max_cstate=0 intel_idle.max_cstate=0 intel_pstate=disable
KERNEL_ARGS_9000_NPB := console=ttyS0,115200n8 pci=realloc,assign-busses
GRUB_SERIAL_COMMAND :=

2
make/Makefile.TSGXBUILDCONTAINERP0906 → make/Makefile.x86_64_COTS_APP_BUNDLE
View File

@@ -1,5 +1,5 @@
PROFILE_ID := TSG-X-NXR620G40-R01-P0906
PROFILE_ID := x86_64_COTS
PROFILE_ID_IN_SHORT := $(subst -,$e,$(PROFILE_ID))
CONTAINER_IMAGES_TAR := traffic-engine-${OS_RELEASE_VER}-docker.tar

12
tools/mk-base-image
View File

@@ -14,14 +14,14 @@ profile_id=$4
setopt="group_package_types=mandatory,default,optional"
case $profile_id in
"TSG-X-NXR620G40-R01-P0906" )
"x86_64_COTS" )
kernel_version="5.17.15-1.el8.x86_64"
append_package_to_install="$projectdir/package/kernel-ml-core-$kernel_version.rpm
$projectdir/package/kernel-ml-modules-$kernel_version.rpm
$projectdir/package/kernel-ml-$kernel_version.rpm
$projectdir/package/kernel-ml-devel-$kernel_version.rpm"
;;
"7400-MCN0-P01R01" | "7400-MCN123-P01R01" |"9000-NPB-P01R01")
"7400-MCN0-P01R01" | "7400-MCN123-P01R01")
kernel_version="5.4.159-1.el7.elrepo.x86_64"
append_package_to_install="$projectdir/package/kernel-lt-$kernel_version.rpm
$projectdir/package/kernel-lt-devel-$kernel_version.rpm"
@@ -34,7 +34,7 @@ case $profile_id in
esac
case $profile_id in
"TSG-X-NXR620G40-R01-P0906" )
"x86_64_COTS" )
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
@@ -42,10 +42,10 @@ case $profile_id in
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++
python3-docutils libnsl liburing hwloc-gui perl-open perl python2 js-d3-flame-graph"
python3-docutils libnsl liburing hwloc-gui perl-open perl python2 js-d3-flame-graph xmlstarlet"
;;
"7400-MCN0-P01R01" | "7400-MCN123-P01R01" |"9000-NPB-P01R01")
"7400-MCN0-P01R01" | "7400-MCN123-P01R01")
base_package_to_install="@base @core @debugging @directory-client @guest-agents
@hardware-monitoring @network-file-system-client @performance @remote-system-management
grub2 epel-release efibootmgr ansible yum-utils ipmitool docker-ce docker-ce-cli
@@ -130,7 +130,7 @@ if [ ! -f "$target/etc/pam.d/password-auth-local" ]; then
fi
case $profile_id in
"7400-MCN0-P01R01" | "7400-MCN123-P01R01" |"9000-NPB-P01R01")
"7400-MCN0-P01R01" | "7400-MCN123-P01R01")
cp -rf $projectdir/rootconf/sysroot-usr/target/* $target/usr/lib/systemd/system
mkdir -p $target/usr/lib/systemd/system/workload.target.wants
;;

2
tools/upload.sh
View File

@@ -37,7 +37,7 @@ function upload_file_by_profile_list()
upload_kvm_glob_file
break
;;
"TSGXBUILDCONTAINERP0906")
"x86_64_COTS_APP_BUNDLE")
upload_app_bundle_glob_file
break
;;