@eturnity/eturnity_3d 6.34.7 → 6.37.1

package/.bitbucket/ci/build_image_config.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+printf "Building configuration for image"
+export BRANCH_NAME=`printf $BITBUCKET_BRANCH | sed -e 's/\//-/g' | sed -e 's/#/_/g'`
+export TAG=$BB_ETURNITY_VERSION-$BRANCH_NAME-$BITBUCKET_COMMIT
+export IMAGE_NAME=$BB_CONTAINER_REGISTRY/$BB_ETURNITY_HUB/$BB_APPLICATION_NAME:$TAG
+printf "BRANCH_NAME=$BRANCH_NAME\n" > .env.image
+printf "TAG=$TAG\n" >> .env.image
+printf "IMAGE_NAME=$IMAGE_NAME\n" >> .env.image

package/bitbucket-pipelines.yml

@@ -16,9 +16,12 @@ definitions:
     - step: &build_and_push_image
         name: Build and push
         size: 2x
+        runs-on:
+          - maintenance.cluster
+          - dofra1
         script:
-          - export TAG=$BB_ETURNITY_VERSION-$BITBUCKET_BRANCH-$BITBUCKET_COMMIT
-          - export IMAGE_NAME=$BB_CONTAINER_REGISTRY/$BB_ETURNITY_HUB/$APPLICATION_NAME:$TAG
+          - ./.bitbucket/ci/build_image_config.sh
+          - export $(cat .env.image | xargs)
           - echo "{\"version\":\"${BB_ETURNITY_VERSION}\",\"full_version\":\"${TAG}\"}" > ./src/assets/version.json
           - docker build -t $IMAGE_NAME .
           - docker login --username $BB_PIPELINE_REGISTRY_TOKEN --password $BB_PIPELINE_REGISTRY_TOKEN $BB_CONTAINER_REGISTRY
@@ -30,21 +33,24 @@ definitions:
     - step: &dev_deploy_only
         name: Deploy to dev cluster
         script:
-        - export TAG=$BB_ETURNITY_VERSION-$BITBUCKET_BRANCH-$BITBUCKET_COMMIT
-        - export IMAGE_NAME=$BB_CONTAINER_REGISTRY/$BB_ETURNITY_HUB/$APPLICATION_NAME:$TAG
-        - pipe: atlassian/kubectl-run:3.7.0
-          variables:
-            KUBE_CONFIG: $BB_KUBE_CONFIG_DEV
-            KUBECTL_COMMAND: 'set image deployment -l eturnityRepository=eturnity-3d main=$IMAGE_NAME --namespace=$NAMESPACE'
-            DEBUG: 'true'
+          - ./.bitbucket/ci/build_image_config.sh
+          - export $(cat .env.image | xargs)
+          - pipe: atlassian/kubectl-run:3.7.0
+            variables:
+              KUBE_CONFIG: $BB_KUBE_CONFIG_DEV
+              KUBECTL_COMMAND: 'set image deployment -l eturnityRepository=eturnity-3d main=$IMAGE_NAME --namespace=$NAMESPACE'
+              DEBUG: 'true'
     - step: &build_prod_and_push_image
         name: Build and push
         size: 2x
+        runs-on:
+          - maintenance.cluster
+          - dofra1
         script:
-          - export TAG=$BB_ETURNITY_VERSION-$BITBUCKET_BRANCH-$NAMESPACE-$BITBUCKET_COMMIT
+          - ./.bitbucket/ci/build_image_config.sh
+          - export $(cat .env.image | xargs)
           - echo "{\"version\":\"${BB_ETURNITY_VERSION}\",\"full_version\":\"${TAG}\"}" > ./src/assets/version.json
           - export RELEASE_TAG=latest
-          - export IMAGE_NAME=$BB_CONTAINER_REGISTRY/$BB_ETURNITY_HUB/$APPLICATION_NAME:$TAG
           - export RELEASE_IMAGE_NAME=$BB_CONTAINER_REGISTRY/$BB_ETURNITY_HUB/$APPLICATION_NAME:$RELEASE_TAG
           - docker build -t $IMAGE_NAME -t $RELEASE_IMAGE_NAME .
           - docker login --username $BB_PIPELINE_REGISTRY_TOKEN --password $BB_PIPELINE_REGISTRY_TOKEN $BB_CONTAINER_REGISTRY
@@ -56,25 +62,15 @@ definitions:
     - step: &prod_deploy_only
         name: Deploy to prod cluster
         script:
-        - export TAG=$BB_ETURNITY_VERSION-$BITBUCKET_BRANCH-$NAMESPACE-$BITBUCKET_COMMIT
-        - export IMAGE_NAME=$BB_CONTAINER_REGISTRY/$BB_ETURNITY_HUB/$APPLICATION_NAME:$TAG
-        - pipe: atlassian/kubectl-run:3.7.0
-          variables:
-            KUBE_CONFIG: $BB_KUBE_CONFIG_PROD
-            KUBECTL_COMMAND: 'set image deployment -l eturnityRepository=eturnity-3d main=$IMAGE_NAME --namespace=$NAMESPACE'
-            DEBUG: 'true'
+          - ./.bitbucket/ci/build_image_config.sh
+          - export $(cat .env.image | xargs)
+          - pipe: atlassian/kubectl-run:3.7.0
+            variables:
+              KUBE_CONFIG: $BB_KUBE_CONFIG_PROD
+              KUBECTL_COMMAND: 'set image deployment -l eturnityRepository=eturnity-3d main=$IMAGE_NAME --namespace=$NAMESPACE'
+              DEBUG: 'true'
 pipelines:
   custom:
-    eturnity-prod-deploy:
-      - variables:
-          - name: NAMESPACE
-            default: "eturnity-prod"
-            allowed-values:
-              - "eturnity-prod"
-      - step: *verify_prod_system
-      - step: *build_prod_and_push_image
-      - step: *prod_deploy_only
-
     staging-v.*.**.*:
       - variables:
           - name: NAMESPACE
@@ -88,9 +84,240 @@ pipelines:
 
 ####################################################################################################################
 ## DO NOT EDIT. GENERATED CODE
-## GENERATOR: templates/bb-pipeline-repo-eturnity-3d.yaml
+## GENERATOR: templates/pipeline/bb-pipeline-repo-eturnity-3d.yaml
 ####################################################################################################################
 
+    eturnity-prod-deploy:
+      - variables:
+          - name: NAMESPACE
+            default: "eturnity-prod"
+            allowed-values:
+              - "eturnity-prod"
+      - step: *verify_prod_system
+      - step: *build_prod_and_push_image
+      - step: *prod_deploy_only
+      - step:
+          name: Fast deploy prod-followers
+          runs-on:
+            - maintenance.cluster
+            - dofra1
+          script:
+            - ./.bitbucket/ci/build_image_config.sh
+            - export $(cat .env.image | xargs)
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+            - echo "deploy to qa-ext-01"
+            - pipe: atlassian/kubectl-run:3.7.0
+              variables:
+                KUBE_CONFIG: $BB_KUBE_CONFIG_DEV
+                KUBECTL_COMMAND: 'set image deployment -l eturnityRepository=eturnity-3d main=$IMAGE_NAME --namespace=qa-ext-01'
+    
+    
+    
+    
+    
+    
+    
+    
+    
+            - echo "deploy to dev-03"
+            - pipe: atlassian/kubectl-run:3.7.0
+              variables:
+                KUBE_CONFIG: $BB_KUBE_CONFIG_DEV
+                KUBECTL_COMMAND: 'set image deployment -l eturnityRepository=eturnity-3d main=$IMAGE_NAME --namespace=dev-03'
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+            - echo "deploy to dev-14"
+            - pipe: atlassian/kubectl-run:3.7.0
+              variables:
+                KUBE_CONFIG: $BB_KUBE_CONFIG_DEV
+                KUBECTL_COMMAND: 'set image deployment -l eturnityRepository=eturnity-3d main=$IMAGE_NAME --namespace=dev-14'
+    
+    
+    
+    
+    
+            - echo "deploy to dev-17"
+            - pipe: atlassian/kubectl-run:3.7.0
+              variables:
+                KUBE_CONFIG: $BB_KUBE_CONFIG_DEV
+                KUBECTL_COMMAND: 'set image deployment -l eturnityRepository=eturnity-3d main=$IMAGE_NAME --namespace=dev-17'
+    
+    
+    
+    
+    
+    
+            - echo "deploy to dev-21"
+            - pipe: atlassian/kubectl-run:3.7.0
+              variables:
+                KUBE_CONFIG: $BB_KUBE_CONFIG_DEV
+                KUBECTL_COMMAND: 'set image deployment -l eturnityRepository=eturnity-3d main=$IMAGE_NAME --namespace=dev-21'
+    
+    
+    
+    
+    
+    
+    
+    
+            - echo "deploy to qa-02"
+            - pipe: atlassian/kubectl-run:3.7.0
+              variables:
+                KUBE_CONFIG: $BB_KUBE_CONFIG_DEV
+                KUBECTL_COMMAND: 'set image deployment -l eturnityRepository=eturnity-3d main=$IMAGE_NAME --namespace=qa-02'
+    
+    
+    
+            - echo "deploy to qa-03"
+            - pipe: atlassian/kubectl-run:3.7.0
+              variables:
+                KUBE_CONFIG: $BB_KUBE_CONFIG_DEV
+                KUBECTL_COMMAND: 'set image deployment -l eturnityRepository=eturnity-3d main=$IMAGE_NAME --namespace=qa-03'
+    
+    
+    
+    
+            - echo "deploy to qa-05"
+            - pipe: atlassian/kubectl-run:3.7.0
+              variables:
+                KUBE_CONFIG: $BB_KUBE_CONFIG_DEV
+                KUBECTL_COMMAND: 'set image deployment -l eturnityRepository=eturnity-3d main=$IMAGE_NAME --namespace=qa-05'
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+            - echo "deploy to qa-17"
+            - pipe: atlassian/kubectl-run:3.7.0
+              variables:
+                KUBE_CONFIG: $BB_KUBE_CONFIG_DEV
+                KUBECTL_COMMAND: 'set image deployment -l eturnityRepository=eturnity-3d main=$IMAGE_NAME --namespace=qa-17'
+    
+    
+    
+    
+    
+    
+            - echo "deploy to qa-21"
+            - pipe: atlassian/kubectl-run:3.7.0
+              variables:
+                KUBE_CONFIG: $BB_KUBE_CONFIG_DEV
+                KUBECTL_COMMAND: 'set image deployment -l eturnityRepository=eturnity-3d main=$IMAGE_NAME --namespace=qa-21'
+    
+    
+    
+    
+    
+    
+    
+            - echo "deploy to test-ext-01"
+            - pipe: atlassian/kubectl-run:3.7.0
+              variables:
+                KUBE_CONFIG: $BB_KUBE_CONFIG_DEV
+                KUBECTL_COMMAND: 'set image deployment -l eturnityRepository=eturnity-3d main=$IMAGE_NAME --namespace=test-ext-01'
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
+
 
     dev-01-deploy:
       - variables:
@@ -829,8 +1056,36 @@ pipelines:
 
       - step: *build_and_push_image
       - step: *dev_deploy_only
+    staging-all:
+    - parallel:
+
+      - step:
+          name: Deploy to staging-01
+          script:
+            - pipe: atlassian/trigger-pipeline:5.2.0
+              variables:
+                BITBUCKET_ACCESS_TOKEN: $BB_ETURNITY_DEPLOY_ACCESS_TOKEN_1
+                REPOSITORY: 'eturnity_expert'
+                CUSTOM_PIPELINE_NAME: 'staging-01-deploy'
+                REF_TYPE: 'branch'
+                REF_NAME: 'staging-v.${BB_STAGING_VERSION}'
+                DEBUG: 'true'
+                WAIT: 'true'
+
+      - step:
+          name: Deploy to staging-02
+          script:
+            - pipe: atlassian/trigger-pipeline:5.2.0
+              variables:
+                BITBUCKET_ACCESS_TOKEN: $BB_ETURNITY_DEPLOY_ACCESS_TOKEN_1
+                REPOSITORY: 'eturnity_expert'
+                CUSTOM_PIPELINE_NAME: 'staging-02-deploy'
+                REF_TYPE: 'branch'
+                REF_NAME: 'staging-v.${BB_STAGING_VERSION}'
+                DEBUG: 'true'
+                WAIT: 'true'
 
 
 ####################################################################################################################
 ## END GENERATED SECTION
-####################################################################################################################
+####################################################################################################################

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eturnity/eturnity_3d",
   "private": false,
-  "version": "6.34.7",
+  "version": "6.37.1",
   "main": "dist/main.js",
   "scripts": {
     "dev": "vue-cli-service serve --skip-plugins @vue/cli-plugin-eslint",
@@ -10,7 +10,7 @@
     "prettier": "prettier --write \"**/*.{js,vue}\""
   },
   "dependencies": {
-    "@eturnity/eturnity_maths": "6.34.3",
+    "@eturnity/eturnity_maths": "6.37.0",
     "axios": "^1.3.2",
     "core-js": "^2.6.12",
     "cors": "^2.8.5",