From 31ae1732d79c3f4846adbe865d74301ef7a76ca9 Mon Sep 17 00:00:00 2001
From: fumingwei <fumingwei@geedgenetworks.com>
Date: Fri, 17 Dec 2021 17:43:14 +0800
Subject: [PATCH] =?UTF-8?q?feature:=E5=B0=86os=E4=B8=8A=E4=BC=A0=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E7=94=B1pulp=E6=94=B9=E4=B8=BAgohttpserver+syncthing?=
 =?UTF-8?q?=E6=90=AD=E5=BB=BA=E7=9A=84=E4=BB=93=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml  | 12 ++++++++++++
 tools/upload.sh |  6 ++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 504a7bd0..b535135c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -57,6 +57,7 @@ develop_build_7400_mcn0:
     PULP3_FILE_REPO_NAME: tsg-os-images-develop
     PULP3_FILE_DIST_NAME: tsg-os-images-develop
     DALIY_BUILD_VERSION: 1
+    FILE_REPO_PATH: install/develop/tsg-os-images
   only:
     - /^dev-.*$/i
 
@@ -69,6 +70,7 @@ develop_build_7400_mcn123:
     PULP3_FILE_REPO_NAME: tsg-os-images-develop
     PULP3_FILE_DIST_NAME: tsg-os-images-develop
     DALIY_BUILD_VERSION: 1
+    FILE_REPO_PATH: install/develop/tsg-os-images
   only:
     - /^dev-.*$/i
 
@@ -81,6 +83,7 @@ develop_build_9000:
     PULP3_FILE_REPO_NAME: tsg-os-images-develop
     PULP3_FILE_DIST_NAME: tsg-os-images-develop
     DALIY_BUILD_VERSION: 1
+    FILE_REPO_PATH: install/develop/tsg-os-images
   only:
     - /^dev-.*$/i
 
@@ -92,6 +95,7 @@ testing_build_7400_mcn0:
     UPLOAD_TO_FILE_REPO: 1
     PULP3_FILE_REPO_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
   only:
     - /^rel-.*$/i
@@ -104,6 +108,7 @@ testing_build_7400_mcn123:
     UPLOAD_TO_FILE_REPO: 1
     PULP3_FILE_REPO_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
   only:
     - /^rel-.*$/i
@@ -116,6 +121,7 @@ testing_build_9000:
     UPLOAD_TO_FILE_REPO: 1
     PULP3_FILE_REPO_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
   only:
     - /^rel-.*$/i
@@ -129,6 +135,7 @@ rc_build_7400_mcn0:
     DALIY_BUILD_VERSION: 0
     PULP3_FILE_REPO_NAME: tsg-os-images-rc
     PULP3_FILE_DIST_NAME: tsg-os-images-rc
+    FILE_REPO_PATH: install/rc/tsg-os-images
   only:
     - /^.*-rc.*$/i
 
@@ -141,6 +148,7 @@ rc_build_7400_mcn123:
     DALIY_BUILD_VERSION: 0
     PULP3_FILE_REPO_NAME: tsg-os-images-rc
     PULP3_FILE_DIST_NAME: tsg-os-images-rc
+    FILE_REPO_PATH: install/rc/tsg-os-images
   only:
     - /^.*-rc.*$/i
 
@@ -153,6 +161,7 @@ rc_build_9000:
     DALIY_BUILD_VERSION: 0
     PULP3_FILE_REPO_NAME: tsg-os-images-rc
     PULP3_FILE_DIST_NAME: tsg-os-images-rc
+    FILE_REPO_PATH: install/rc/tsg-os-images
   only:
     - /^.*-rc.*$/i
 
@@ -165,6 +174,7 @@ release_build_7400_mcn0:
     DALIY_BUILD_VERSION: 0
     PULP3_FILE_REPO_NAME: tsg-os-images-release
     PULP3_FILE_DIST_NAME: tsg-os-images-release
+    FILE_REPO_PATH: install/release/tsg-os-images
   only:
     - tags
   except:
@@ -179,6 +189,7 @@ release_build_7400_mcn123:
     DALIY_BUILD_VERSION: 0
     PULP3_FILE_REPO_NAME: tsg-os-images-release
     PULP3_FILE_DIST_NAME: tsg-os-images-release
+    FILE_REPO_PATH: install/release/tsg-os-images
   only:
     - tags
   except:
@@ -193,6 +204,7 @@ release_build_9000:
     DALIY_BUILD_VERSION: 0
     PULP3_FILE_REPO_NAME: tsg-os-images-release
     PULP3_FILE_DIST_NAME: tsg-os-images-release
+    FILE_REPO_PATH: install/release/tsg-os-images
   only:
     - tags
   except:
diff --git a/tools/upload.sh b/tools/upload.sh
index 4af003f0..27787c42 100644
--- a/tools/upload.sh
+++ b/tools/upload.sh
@@ -4,6 +4,8 @@ ls -halt $CI_PROJECT_DIR
 ls -halt $CI_PROJECT_DIR/images/
 cat $CI_PROJECT_DIR/images/*.sha256sum.txt
 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/*.sha256sum.txt
+	#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_to_share_repo.py ${FILE_REPO_PATH} ./images/*.bin
+	python3 ~/file_upload_tools_to_share_repo.py ${FILE_REPO_PATH} ./images/*.sha256sum.txt
 fi
\ No newline at end of file