up

ci/deploy/deploy-cloud.inc.yml

@@ -5,7 +5,7 @@ deploy-cloud:
       when: never
     - if: $CI_COMMIT_BRANCH && $CI_PIPELINE_SOURCE == "merge_request_event"
       when: never
-    - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "main"
+    - if: $CI_PIPELINE_SOURCE == "push" && ($CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "feature/ci")
       when: manual
   extends:
     - .deploy-template

ci/deploy/deploy-template.inc.yml

@@ -26,19 +26,11 @@
         ssh-keyscan "${stand}" >> ~/.ssh/known_hosts
       done
     - chmod 644 ~/.ssh/known_hosts
-    # Если получилось что-то пустое
-    - >
-      if [[ -z "$APPVERSION" ]]; then 
-        APPVERSION="0.0.1"
-      fi
   script:
-    - mkdir -p ${CI_PROJECT_DIR}/utils/
-    - cd ${CI_PROJECT_DIR}/utils/
-    - wget -q --no-check-certificate --output-document "deploy.sh" --header "PRIVATE-TOKEN:${GITLAB_TOKEN}" "https://git.vimpelcom.ru/api/v4/projects/9556/repository/files/ci%2Fdeploy%2Fdeploy.sh/raw"
     - >
       for stand in $STANDS; do
         echo -e "Connect to ${stand}..." &&
-        scp -o StrictHostKeyChecking=no deploy.sh "dorootless@${stand}:~/deploy.sh" &&
+        scp -o StrictHostKeyChecking=no ci/deploy/deploy.sh "dorootless@${stand}:~/deploy.sh" &&
         ssh "dorootless@${stand}" "export CONTAINER_REGISTRY=$CONTAINER_REGISTRY &&
         export PRODUCT=$PRODUCT &&
         export PRODUCT_VERSION=$PRODUCT_VERSION &&
@@ -50,5 +42,3 @@
   needs:
     - job: build-image-npm
       optional: true
-    - job: build-image-go
-      optional: true

ci/develop.yml

@@ -24,7 +24,7 @@ develop:npm:
       dotenv: .env
     expire_in: 1h
 
-develop-image:
+build-image-npm:
   image: harbor.vimpelcom.ru/dockerhub/library/docker:20.10.11-dind
   stage: package
   rules: