lith il y a 3 ans
Parent
commit
3b5300182d

+ 3 - 3
Publish/DevOps/build-bash/30.nuget-pack.sh

@@ -8,11 +8,11 @@ set -e
 args_="
 
 export basePath=/root/temp/svn
-export _nugetPath=$basePath/Publish/release/.nuget
+export NUGET_PATH=$basePath/Publish/release/.nuget
 
 # "
 
-if [ ! $_nugetPath ]; then _nugetPath=$basePath/Publish/release/.nuget; fi
+if [ ! $NUGET_PATH ]; then NUGET_PATH=$basePath/Publish/release/.nuget; fi
 
 mkdir -p $basePath/Publish/release/release/nuget
 nugetPath=Publish/release/release/nuget
@@ -23,7 +23,7 @@ nugetPath=Publish/release/release/nuget
 echo "(x.2)nuget-pack"
 docker run -i --rm \
 --env LANG=C.UTF-8 \
--v $_nugetPath:/root/.nuget \
+-v $NUGET_PATH:/root/.nuget \
 -v $basePath:/root/code \
 serset/dotnet:sdk-6.0 \
 bash -c "

+ 3 - 3
Publish/DevOps/build-bash/40.Station-publish.sh

@@ -6,11 +6,11 @@ set -e
 args_="
 
 export basePath=/root/temp/svn
-export _nugetPath=$basePath/Publish/release/.nuget
+export NUGET_PATH=$basePath/Publish/release/.nuget
 
 # "
 
-if [ ! $_nugetPath ]; then _nugetPath=$basePath/Publish/release/.nuget; fi
+if [ ! $NUGET_PATH ]; then NUGET_PATH=$basePath/Publish/release/.nuget; fi
 
 
 #----------------------------------------------
@@ -31,7 +31,7 @@ mkdir -p $publishPath
 
 docker run -i --rm \
 --env LANG=C.UTF-8 \
--v $_nugetPath:/root/.nuget \
+-v $NUGET_PATH:/root/.nuget \
 -v $basePath:/root/code \
 serset/dotnet:sdk-6.0 \
 bash -c "

+ 4 - 1
Publish/DevOps/build-bash/41.StressTest-publish.sh

@@ -6,9 +6,12 @@ set -e
 args_="
 
 export basePath=/root/temp/svn
+export NUGET_PATH=$basePath/Publish/release/.nuget
 
 # "
 
+if [ ! $NUGET_PATH ]; then NUGET_PATH=$basePath/Publish/release/.nuget; fi
+
 
 #---------------------------------------------------------------------
 #(x.2)
@@ -23,7 +26,7 @@ echo '(x.3)发布CL压测'
 docker run -i --rm \
 --env LANG=C.UTF-8 \
 -v $basePath:/root/code \
--v $basePath/Publish/release/.nuget:/root/.nuget \
+-v $NUGET_PATH:/root/.nuget \
 serset/dotnet:sdk-6.0 \
 bash -c "
 set -e

+ 10 - 1
Publish/DevOps/jenkins-bash/startup.bash

@@ -3,6 +3,15 @@ set -e
 
 # cd /root/docker-data/dev/jenkins/jenkins_home/workspace/Repo/Sers/code/Publish/DevOps/jenkins-bash; bash startup.bash;
 
+#chroot /host bash -c "set -e; \
+#export SVN_USERNAME=jenkins; \
+#export SVN_PASSWORD=xxxxxx; \
+#export DOCKER_USERNAME=serset; \
+#export DOCKER_PASSWORD=xxxxxx; \
+#export NUGET_KEY=xxxxxx; \
+#export NUGET_SERVER=https://api.nuget.org/v3/index.json; \
+#export NUGET_PATH=/root/docker-data/dev/jenkins/jenkins_home/workspace/.nuget; \
+#cd /root/docker-data/dev/jenkins/jenkins_home/workspace/Repo/Sers/code/Publish/DevOps/jenkins-bash; bash startup.bash; "
 
 #---------------------------------------------------------------------
 #(x.1)²ÎÊý
@@ -17,7 +26,7 @@ export DOCKER_PASSWORD=xxxxxx
 export NUGET_SERVER=https://api.nuget.org/v3/index.json
 export NUGET_KEY=xxxxxx
 
-export _nugetPath=/root/docker-data/dev/jenkins/jenkins_home/workspace/.nuget
+export NUGET_PATH=/root/docker-data/dev/jenkins/jenkins_home/workspace/.nuget
 
 # "