调整dns的yml配置文件

2 files changed, 25 insertions, 22 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5f804a9..b911c77 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,13 +8,11 @@ variables:
   DOCKER_HOST: tcp://docker:2375
   DOCKER_DRIVER: overlay2
   IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
-  ARTIFACTS_JOB: "dns-debug-package"
-
 
 stages:
   - build
   - package
-  #- release
+  - release
 
 .build_before_script:
   before_script:
@@ -32,7 +30,6 @@ stages:
     - cd build
     - cmake ..  -DCMAKE_BUILD_TYPE=$BUILD_TYPE
     - make
-    
 
 .package_dns:
     extends: .build_before_script
@@ -45,13 +42,13 @@ stages:
       - cmake ..  -DCMAKE_BUILD_TYPE=$BUILD_TYPE
       - make package
 
-build-debug:
+build:
   stage: build
   extends:   .build_dns
   tags:
     - share
   variables:
-    BUILD_TYPE: "Debug"
+    BUILD_TYPE: "Release"
   except:
     - tags
 
@@ -66,26 +63,30 @@ build-debug:
 #  only:
 #    - tags
 
-dns-debug-package:
+dns-package:
     stage: package
     extends: .package_dns
     tags:
       - share
     variables:
-        BUILD_TYPE: "Debug"
+        BUILD_TYPE: "Release"
     artifacts:
-        name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME-debug"
+        name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
         paths:
           -  ./build/*.rpm
     only:
     - tags
 
-#release:
-#  stage: release
-#  image: git.mesalab.cn:7443/mesa_framework/framework:master
-#  tags:
-#    - share
-#  only:
-#    - tags
-#  script:
-#    - /bin/bash -x ./autorelease.sh $CI_API_V4_URL $CI_PROJECT_URL $CI_PROJECT_ID $CI_TOKEN $CI_COMMIT_TAG $ARTIFACTS_JOB $CI_PROJECT_NAME
+release:
+  stage: release
+  image: git.mesalab.cn:7443/mesa_framework/framework:master
+  tags:
+    - share
+  only:
+    - tags
+  variables:
+    - ARTIFACTS_JOB: "dns-package"
+    - PROJECT_NAME: "dns"
+    - USER_DEFINE: "release"
+  script:
+    - /bin/bash -x ./autorelease.sh $CI_API_V4_URL $CI_PROJECT_URL $CI_PROJECT_ID $CI_TOKEN $CI_COMMIT_TAG $ARTIFACTS_JOB $CI_PROJECT_NAME $USER_DEFINE
diff --git a/autorelease.sh b/autorelease.sh
index 10f9a31..34eaefb 100644
--- a/autorelease.sh
+++ b/autorelease.sh
@@ -1,8 +1,9 @@
 #!/bin/sh
-if [ $# -lt 7 ] ; then
+if [ $# -lt 8 ] ; then
     echo "USAGE: ./autorelease.sh [API_V4_URL] [PROJECT_URL]
     [PROJECT_ID] [TOKEN]
-    [COMMIT_TAG] [JOB] [PROJECT_NAME]"
+    [COMMIT_TAG] [JOB] [PROJECT_NAME] [USER_DEFINE]"
+    echo "$1; $2; $3; $4; $5; $6; $7; $8"
 exit 1;
 fi
 
@@ -13,12 +14,13 @@ CI_TOKEN=$4
 CI_COMMIT_TAG=$5
 ARTIFACTS_JOB=$6
 CI_PROJECT_NAME=$7
+USER_DEFINE=$8
 
 res=`echo -e "curl --header \"PRIVATE-TOKEN: $CI_TOKEN\" $CI_API_V4_URL/projects/$CI_PROJECT_ID/releases/$CI_COMMIT_TAG -o /dev/null -s -w %{http_code}"| /bin/bash`
 
 if [[ $res == "200" ]]; then
     eval $(echo -e "curl --request POST --header \"PRIVATE-TOKEN: $CI_TOKEN\" \
-        --data name=\"$CI_PROJECT_NAME-$CI_COMMIT_TAG-artifacts.zip\" \
+        --data name=\"$CI_PROJECT_NAME-$USER_DEFINE-$CI_COMMIT_TAG.zip\" \
         --data url=\"$CI_PROJECT_URL/-/jobs/artifacts/$CI_COMMIT_TAG/download?job=$ARTIFACTS_JOB\"\
         $CI_API_V4_URL/projects/$CI_PROJECT_ID/releases/$CI_COMMIT_TAG/assets/links")
 else
@@ -26,7 +28,7 @@ else
         \"PRIVATE-TOKEN: $CI_TOKEN\" --data '{ \"name\": \"$CI_COMMIT_TAG\",  \
         \"tag_name\": \"$CI_COMMIT_TAG\", \"description\": \"auto_release\",\
         \"assets\": { \"links\": [{ \"name\": \
-        \"$CI_PROJECT_NAME-$CI_COMMIT_TAG-artifacts.zip\", \"url\": \
+        \"$CI_PROJECT_NAME-$USER_DEFINE-$CI_COMMIT_TAG.zip\", \"url\": \
         \"$CI_PROJECT_URL/-/jobs/artifacts/$CI_COMMIT_TAG/download?job=$ARTIFACTS_JOB\"\
     }] } }' --request POST $CI_API_V4_URL/projects/$CI_PROJECT_ID/releases/")
 fi
\ No newline at end of file