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

feature:将os上传仓库由pulp改为gohttpserver+syncthing搭建的仓库

Browse Source
This commit is contained in:
fumingwei
2021-12-17 17:43:14 +08:00
parent a7ea5c4582
commit 31ae1732d7
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.gitlab-ci.yml
View File

@@ -57,6 +57,7 @@ develop_build_7400_mcn0:
PULP3_FILE_REPO_NAME: tsg-os-images-develop PULP3_FILE_REPO_NAME: tsg-os-images-develop
PULP3_FILE_DIST_NAME: tsg-os-images-develop PULP3_FILE_DIST_NAME: tsg-os-images-develop
DALIY_BUILD_VERSION: 1 DALIY_BUILD_VERSION: 1
FILE_REPO_PATH: install/develop/tsg-os-images
only: only:
- /^dev-.*$/i - /^dev-.*$/i
@@ -69,6 +70,7 @@ develop_build_7400_mcn123:
PULP3_FILE_REPO_NAME: tsg-os-images-develop PULP3_FILE_REPO_NAME: tsg-os-images-develop
PULP3_FILE_DIST_NAME: tsg-os-images-develop PULP3_FILE_DIST_NAME: tsg-os-images-develop
DALIY_BUILD_VERSION: 1 DALIY_BUILD_VERSION: 1
FILE_REPO_PATH: install/develop/tsg-os-images
only: only:
- /^dev-.*$/i - /^dev-.*$/i
@@ -81,6 +83,7 @@ develop_build_9000:
PULP3_FILE_REPO_NAME: tsg-os-images-develop PULP3_FILE_REPO_NAME: tsg-os-images-develop
PULP3_FILE_DIST_NAME: tsg-os-images-develop PULP3_FILE_DIST_NAME: tsg-os-images-develop
DALIY_BUILD_VERSION: 1 DALIY_BUILD_VERSION: 1
FILE_REPO_PATH: install/develop/tsg-os-images
only: only:
- /^dev-.*$/i - /^dev-.*$/i
@@ -92,6 +95,7 @@ testing_build_7400_mcn0:
UPLOAD_TO_FILE_REPO: 1 UPLOAD_TO_FILE_REPO: 1
PULP3_FILE_REPO_NAME: tsg-os-images-testing PULP3_FILE_REPO_NAME: tsg-os-images-testing
PULP3_FILE_DIST_NAME: tsg-os-images-testing PULP3_FILE_DIST_NAME: tsg-os-images-testing
FILE_REPO_PATH: install/testing/tsg-os-images
DALIY_BUILD_VERSION: 1 DALIY_BUILD_VERSION: 1
only: only:
- /^rel-.*$/i - /^rel-.*$/i
@@ -104,6 +108,7 @@ testing_build_7400_mcn123:
UPLOAD_TO_FILE_REPO: 1 UPLOAD_TO_FILE_REPO: 1
PULP3_FILE_REPO_NAME: tsg-os-images-testing PULP3_FILE_REPO_NAME: tsg-os-images-testing
PULP3_FILE_DIST_NAME: tsg-os-images-testing PULP3_FILE_DIST_NAME: tsg-os-images-testing
FILE_REPO_PATH: install/testing/tsg-os-images
DALIY_BUILD_VERSION: 1 DALIY_BUILD_VERSION: 1
only: only:
- /^rel-.*$/i - /^rel-.*$/i
@@ -116,6 +121,7 @@ testing_build_9000:
UPLOAD_TO_FILE_REPO: 1 UPLOAD_TO_FILE_REPO: 1
PULP3_FILE_REPO_NAME: tsg-os-images-testing PULP3_FILE_REPO_NAME: tsg-os-images-testing
PULP3_FILE_DIST_NAME: tsg-os-images-testing PULP3_FILE_DIST_NAME: tsg-os-images-testing
FILE_REPO_PATH: install/testing/tsg-os-images
DALIY_BUILD_VERSION: 1 DALIY_BUILD_VERSION: 1
only: only:
- /^rel-.*$/i - /^rel-.*$/i
@@ -129,6 +135,7 @@ rc_build_7400_mcn0:
DALIY_BUILD_VERSION: 0 DALIY_BUILD_VERSION: 0
PULP3_FILE_REPO_NAME: tsg-os-images-rc PULP3_FILE_REPO_NAME: tsg-os-images-rc
PULP3_FILE_DIST_NAME: tsg-os-images-rc PULP3_FILE_DIST_NAME: tsg-os-images-rc
FILE_REPO_PATH: install/rc/tsg-os-images
only: only:
- /^.*-rc.*$/i - /^.*-rc.*$/i
@@ -141,6 +148,7 @@ rc_build_7400_mcn123:
DALIY_BUILD_VERSION: 0 DALIY_BUILD_VERSION: 0
PULP3_FILE_REPO_NAME: tsg-os-images-rc PULP3_FILE_REPO_NAME: tsg-os-images-rc
PULP3_FILE_DIST_NAME: tsg-os-images-rc PULP3_FILE_DIST_NAME: tsg-os-images-rc
FILE_REPO_PATH: install/rc/tsg-os-images
only: only:
- /^.*-rc.*$/i - /^.*-rc.*$/i
@@ -153,6 +161,7 @@ rc_build_9000:
DALIY_BUILD_VERSION: 0 DALIY_BUILD_VERSION: 0
PULP3_FILE_REPO_NAME: tsg-os-images-rc PULP3_FILE_REPO_NAME: tsg-os-images-rc
PULP3_FILE_DIST_NAME: tsg-os-images-rc PULP3_FILE_DIST_NAME: tsg-os-images-rc
FILE_REPO_PATH: install/rc/tsg-os-images
only: only:
- /^.*-rc.*$/i - /^.*-rc.*$/i
@@ -165,6 +174,7 @@ release_build_7400_mcn0:
DALIY_BUILD_VERSION: 0 DALIY_BUILD_VERSION: 0
PULP3_FILE_REPO_NAME: tsg-os-images-release PULP3_FILE_REPO_NAME: tsg-os-images-release
PULP3_FILE_DIST_NAME: tsg-os-images-release PULP3_FILE_DIST_NAME: tsg-os-images-release
FILE_REPO_PATH: install/release/tsg-os-images
only: only:
- tags - tags
except: except:
@@ -179,6 +189,7 @@ release_build_7400_mcn123:
DALIY_BUILD_VERSION: 0 DALIY_BUILD_VERSION: 0
PULP3_FILE_REPO_NAME: tsg-os-images-release PULP3_FILE_REPO_NAME: tsg-os-images-release
PULP3_FILE_DIST_NAME: tsg-os-images-release PULP3_FILE_DIST_NAME: tsg-os-images-release
FILE_REPO_PATH: install/release/tsg-os-images
only: only:
- tags - tags
except: except:
@@ -193,6 +204,7 @@ release_build_9000:
DALIY_BUILD_VERSION: 0 DALIY_BUILD_VERSION: 0
PULP3_FILE_REPO_NAME: tsg-os-images-release PULP3_FILE_REPO_NAME: tsg-os-images-release
PULP3_FILE_DIST_NAME: tsg-os-images-release PULP3_FILE_DIST_NAME: tsg-os-images-release
FILE_REPO_PATH: install/release/tsg-os-images
only: only:
- tags - tags
except: except:

6
tools/upload.sh
View File

@@ -4,6 +4,8 @@ ls -halt $CI_PROJECT_DIR
ls -halt $CI_PROJECT_DIR/images/ ls -halt $CI_PROJECT_DIR/images/
cat $CI_PROJECT_DIR/images/*.sha256sum.txt cat $CI_PROJECT_DIR/images/*.sha256sum.txt
if [ -n "${UPLOAD_TO_FILE_REPO}" ]; then if [ -n "${UPLOAD_TO_FILE_REPO}" ]; then
python3 ~/file_upload_tools.py ${PULP3_FILE_REPO_NAME} ${PULP3_FILE_DIST_NAME} ./images/*.bin #python3 ~/file_upload_tools.py ${PULP3_FILE_REPO_NAME} ${PULP3_FILE_DIST_NAME} ./images/*.bin
python3 ~/file_upload_tools.py ${PULP3_FILE_REPO_NAME} ${PULP3_FILE_DIST_NAME} ./images/*.sha256sum.txt #python3 ~/file_upload_tools.py ${PULP3_FILE_REPO_NAME} ${PULP3_FILE_DIST_NAME} ./images/*.sha256sum.txt
python3 ~/file_upload_tools_to_share_repo.py ${FILE_REPO_PATH} ./images/*.bin
python3 ~/file_upload_tools_to_share_repo.py ${FILE_REPO_PATH} ./images/*.sha256sum.txt
fi fi