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

feature:TSG-13281:新增生成traffic-engine安装包

Browse Source
This commit is contained in:
fumingwei
2023-05-16 18:48:37 +08:00
parent 47c8f458d5
commit f5fa87eedd
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
make/Makefile.TSGXBUILDCONTAINERP0906
View File

@@ -3,10 +3,10 @@ PROFILE_ID := TSG-X-NXR620G40-R01-P0906
PROFILE_ID_IN_SHORT := $(subst -,$e,$(PROFILE_ID))
CONTAINER_IMAGES_PKG := tsg-os-${OS_RELEASE_VER}-${PROFILE_ID_IN_SHORT}-container-images.tar.bz2
TRAFFIC_ENGINE_TAR := tsg-os-${OS_RELEASE_VER}-${PROFILE_ID_IN_SHORT}-traffic-engine.tar.gz
TARGET_SYSROOT_DIR := $(TARGET_BUILD_DIR)/sysroot
TARGET_CONTAINER_IMAGE_TAR_DIR := $(TARGET_BUILD_DIR)/container_images/tar
TOOLS_INSTALL_IMAGE_NAME_TAG := 8-base-tools-installed-${OS_RELEASE_VER}
TOOLS_INSTALL_CONTAINER_NAME := rockylinux-8-base-tools-install-${OS_RELEASE_VER}
@@ -48,6 +48,8 @@ all: container-tar
builddir:
mkdir -p $(TARGET_CONTAINER_IMAGE_TAR_DIR)
mkdir -p /tmp/helm
tar -zxvf $(PROJECTDIR)/ansible/roles/traffic-engine/files/helm-linux-amd64.tar.gz -C /tmp/helm
installer: builddir
sed -i '/sapp-pr:/d;/tfe-pr:/d;/mrzcpd:/d' $(PROJECTDIR)/ansible/install_config/group_vars/rpm_version.yml
@@ -156,7 +158,12 @@ container-tar: installer container-images-generate
$(CONTAINER_IMAGE_REPO_PREFIX)/tsg-$(BFDD_COMPONENT_NAME):$(OS_RELEASE_VER) \
$(CONTAINER_IMAGE_REPO_PREFIX)/tsg-$(SHAPING_COMPONENT_NAME):$(OS_RELEASE_VER)
tar --exclude=*~ --exclude-backups --owner=root --group=root -c -C $(TARGET_CONTAINER_IMAGE_TAR_DIR) . | pbzip2 -p9 > $(IMAGEDIR_BASE)/$(CONTAINER_IMAGES_PKG)
sha256sum $(IMAGEDIR_BASE)/$(CONTAINER_IMAGES_PKG) | awk '{print $$1}' > $(IMAGEDIR_BASE)/$(CONTAINER_IMAGES_PKG).sha256sum.txt
/tmp/helm/linux-amd64/helm package --app-version $(OS_RELEASE_VER) --version $(HELM_CHART_VER) -d $(IMAGEDIR_BASE) $(PROJECTDIR)/ansible/roles/traffic-engine/files/helm
/tmp/helm/linux-amd64/helm package --app-version $(OS_RELEASE_VER) --version $(HELM_CHART_VER) -d $(IMAGEDIR_BASE) $(PROJECTDIR)/ansible/roles/k3s-exporter/files/mrzcpd/helm
cd $(IMAGEDIR_BASE)
tar -zcvf /tmp/$(TRAFFIC_ENGINE_TAR) .
mv /tmp/$(TRAFFIC_ENGINE_TAR) $(IMAGEDIR_BASE)
sha256sum $(IMAGEDIR_BASE)/$(TRAFFIC_ENGINE_TAR) | awk '{print $$1}' > $(IMAGEDIR_BASE)/$(TRAFFIC_ENGINE_TAR).sha256sum.txt
clean:
rm -rf $(TARGET_BUILD_DIR)

4
make/Makefile.TSGXNXR620G40R01P0906
View File

@@ -12,7 +12,8 @@ CHROOT_BIN := tsg-os-${OS_RELEASE_VER}-${PROFILE_ID_IN_SHORT}-ONIE.bin
CONTAINER_IMAGES_PKG := tsg-os-${OS_RELEASE_VER}-${PROFILE_ID_IN_SHORT}-container-images.tar.bz2
TARGET_BUILD_DIR := $(BUILDDIR_BASE)/$(PROFILE_ID)
TARGET_INSTALLER_DIR := $(TARGET_BUILD_DIR)/installer
TARGET_INSTALLER_DIR := $(TARGET_BUILD_DIR)/
TARGET_SYSROOT_DIR := $(TARGET_BUILD_DIR)/sysroot
.PHONY: all builddir installer sysroot-base sysroot-cleanup sysroot-archive sysroot-binary add-images-into-sysroot clean
@@ -63,7 +64,6 @@ sysroot-cleanup:
add-images-into-sysroot: builddir sysroot-verfile sysroot-ansible
mv $(IMAGEDIR_BASE)/$(CONTAINER_IMAGES_PKG) $(TARGET_INSTALLER_DIR)/$(CONTAINER_IMAGES_PKG)
rm $(IMAGEDIR_BASE)/$(CONTAINER_IMAGES_PKG).sha256sum.txt
sysroot-archive: installer add-images-into-sysroot sysroot-cleanup
mv $(IMAGEDIR_BASE)/80-tfe.conf $(TARGET_SYSROOT_DIR)/etc/sysctl.d/

2
tools/upload.sh
View File

@@ -12,7 +12,7 @@ if [ -n "${UPLOAD_TO_FILE_REPO}" ]; then
python3 ~/file_upload_tools_to_share_repo.py ${FILE_REPO_PATH} ./images/*.img
python3 ~/file_upload_tools_to_share_repo.py ${FILE_REPO_PATH} ./images/*.gns3a
elif [ "${PROFILE_LIST}" == "TSGXBUILDCONTAINERP0906" ]; then
python3 ~/file_upload_tools_to_share_repo.py ${FILE_REPO_PATH} ./images/*.tar.bz2
python3 ~/file_upload_tools_to_share_repo.py ${FILE_REPO_PATH} ./images/*.tar.gz
else
python3 ~/file_upload_tools_to_share_repo.py ${FILE_REPO_PATH} ./images/*.bin
fi