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

feature:在ci上编译TSG-X使用mirrors.cloud.aliyuncs.com仓库域名

Browse Source
This commit is contained in:
fumingwei
2023-07-03 19:31:52 +08:00
committed by 付明卫
parent 39bc5d8016
commit 9666bbc7e3
4 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.gitlab-ci.yml
View File

@@ -145,6 +145,7 @@ feature_branch_build_container_images_TSGXP0906:
PROFILE_LIST: TSGXBUILDCONTAINERP0906
DALIY_BUILD_VERSION: 1
ENABLE_LICENSE_PROTECTED: 0
ENABLE_ALIYUN_INTERNAL_DOMAIN: 1
cache:
key: $CI_COMMIT_REF_SLUG-TSGXP0906
paths:
@@ -164,6 +165,7 @@ feature_branch_build_TSGXP0906:
variables:
PROFILE_LIST: TSGXNXR620G40R01P0906
DALIY_BUILD_VERSION: 1
ENABLE_ALIYUN_INTERNAL_DOMAIN: 1
cache:
key: $CI_COMMIT_REF_SLUG-TSGXP0906
paths:
@@ -297,6 +299,7 @@ develop_build_container_images_TSGXP0906:
DALIY_BUILD_VERSION: 1
FILE_REPO_PATH: install/develop/tsg-os-images
ENABLE_LICENSE_PROTECTED: 0
ENABLE_ALIYUN_INTERNAL_DOMAIN: 1
cache:
key: $CI_COMMIT_REF_SLUG-TSGXP0906
paths:
@@ -317,6 +320,7 @@ develop_build_TSGXP0906:
PULP3_FILE_DIST_NAME: tsg-os-images-develop
DALIY_BUILD_VERSION: 1
FILE_REPO_PATH: install/develop/tsg-os-images
ENABLE_ALIYUN_INTERNAL_DOMAIN: 1
cache:
key: $CI_COMMIT_REF_SLUG-TSGXP0906
paths:
@@ -451,6 +455,7 @@ testing_build_container_images_TSGXP0906:
FILE_REPO_PATH: install/testing/tsg-os-images
DALIY_BUILD_VERSION: 1
ENABLE_LICENSE_PROTECTED: 1
ENABLE_ALIYUN_INTERNAL_DOMAIN: 1
cache:
key: $CI_COMMIT_REF_SLUG-TSGXP0906
paths:
@@ -471,6 +476,7 @@ testing_build_TSGXP0906:
PULP3_FILE_DIST_NAME: tsg-os-images-testing
FILE_REPO_PATH: install/testing/tsg-os-images
DALIY_BUILD_VERSION: 1
ENABLE_ALIYUN_INTERNAL_DOMAIN: 1
cache:
key: $CI_COMMIT_REF_SLUG-TSGXP0906
paths:
@@ -605,6 +611,7 @@ rc_build_container_images_TSGXP0906:
PULP3_FILE_DIST_NAME: tsg-os-images-rc
FILE_REPO_PATH: install/rc/tsg-os-images
ENABLE_LICENSE_PROTECTED: 1
ENABLE_ALIYUN_INTERNAL_DOMAIN: 1
cache:
key: $CI_COMMIT_REF_SLUG-TSGXP0906
paths:
@@ -625,6 +632,7 @@ 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
ENABLE_ALIYUN_INTERNAL_DOMAIN: 1
cache:
key: $CI_COMMIT_REF_SLUG-TSGXP0906
paths:
@@ -769,6 +777,7 @@ release_build_container_images_TSGXP0906:
PULP3_FILE_DIST_NAME: tsg-os-images-release
FILE_REPO_PATH: install/release/tsg-os-images
ENABLE_LICENSE_PROTECTED: 1
ENABLE_ALIYUN_INTERNAL_DOMAIN: 1
cache:
key: $CI_COMMIT_REF_SLUG-TSGXP0906
paths:
@@ -791,6 +800,7 @@ 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
ENABLE_ALIYUN_INTERNAL_DOMAIN: 1
cache:
key: $CI_COMMIT_REF_SLUG-TSGXP0906
paths:

5
Makefile
View File

@@ -92,6 +92,10 @@ ifndef ENABLE_LICENSE_PROTECTED
ENABLE_LICENSE_PROTECTED := 0
endif
ifndef ENABLE_LICENSE_PROTECTED
ENABLE_ALIYUN_INTERNAL_DOMAIN := 0
endif
export TOOLSDIR
export CONFDIR
export INSTALLERDIR
@@ -102,6 +106,7 @@ export OS_RELEASE_VER
export LOCK_STATE
export HELM_CHART_VER
export ENABLE_LICENSE_PROTECTED
export ENABLE_ALIYUN_INTERNAL_DOMAIN
.PHONY: all clean $(PROFILE_LIST)

4
make/Makefile.TSGXBUILDCONTAINERP0906
View File

@@ -58,6 +58,10 @@ else
sed -i '/sapp-pr:/d;/tfe-pr:/d;/mrzcpd:/d' $(PROJECTDIR)/ansible/install_config/group_vars/rpm_version.yml
endif
ifeq ($(ENABLE_ALIYUN_INTERNAL_DOMAIN),1)
sed -i -e "s/mirrors.aliyun.com/mirrors.cloud.aliyuncs.com/" $(CONFDIR)/yum-RockyLinux-8.conf
endif
container-images-generate: builddir
podman load < $(PROJECTDIR)/package/rockylinux8.tar
buildah from --name $(TOOLS_INSTALL_CONTAINER_NAME) rockylinux:8

3
make/Makefile.TSGXNXR620G40R01P0906
View File

@@ -41,6 +41,9 @@ installer: builddir
sed -i -e "s/%%CONTAINER_IMAGES_PKG%%/$(CONTAINER_IMAGES_PKG)/" $(TARGET_INSTALLER_DIR)/install.sh
sed -i '/sapp-pr:/d;/tfe-pr:/d;/mrzcpd:/d' $(PROJECTDIR)/ansible/install_config/group_vars/rpm_version.yml
ifeq ($(ENABLE_ALIYUN_INTERNAL_DOMAIN),1)
sed -i -e "s/mirrors.aliyun.com/mirrors.cloud.aliyuncs.com/" $(CONFDIR)/yum-RockyLinux-8.conf
endif
sysroot-base: builddir
$(TOOLSDIR)/mk-base-image $(CONFDIR)/yum-RockyLinux-8.conf $(TARGET_SYSROOT_DIR) $(PROJECTDIR) $(PROFILE_ID)