@eturnity/eturnity_3d 6.33.0 → 6.34.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -10,20 +10,13 @@ definitions:
10
10
  steps:
11
11
  - step: &verify_prod_system
12
12
  name: Check rights for PROD
13
- deployment: PROD
13
+ deployment: eturnity-prod
14
14
  script:
15
15
  - echo "Access to PROD deployment granted"
16
- - step: &verify_staging_system
17
- name: Check rights for STAGING
18
- deployment: STAGING
19
- script:
20
- - echo "Access to STAGING deployment granted"
21
16
  - step: &build_and_push_image
22
17
  name: Build and push
23
18
  size: 2x
24
- script: &build_and_push_image_script
25
- - set -e
26
- - set -o pipefail
19
+ script:
27
20
  - export TAG=$BB_ETURNITY_VERSION-$BITBUCKET_BRANCH-$BITBUCKET_COMMIT
28
21
  - export IMAGE_NAME=$BB_CONTAINER_REGISTRY/$BB_ETURNITY_HUB/$APPLICATION_NAME:$TAG
29
22
  - echo "{\"version\":\"${BB_ETURNITY_VERSION}\",\"full_version\":\"${TAG}\"}" > ./src/assets/version.json
@@ -34,13 +27,12 @@ definitions:
34
27
  - docker
35
28
  caches:
36
29
  - docker
37
- - step: &deploy_to_cluster
38
- name: Deploy to cluster
39
- script: &deploy_to_cluster_script
40
- - export $(cat .env.namespace | xargs)
30
+ - step: &dev_deploy_only
31
+ name: Deploy to dev cluster
32
+ script:
41
33
  - export TAG=$BB_ETURNITY_VERSION-$BITBUCKET_BRANCH-$BITBUCKET_COMMIT
42
34
  - export IMAGE_NAME=$BB_CONTAINER_REGISTRY/$BB_ETURNITY_HUB/$APPLICATION_NAME:$TAG
43
- - pipe: atlassian/kubectl-run:3.4.0
35
+ - pipe: atlassian/kubectl-run:3.7.0
44
36
  variables:
45
37
  KUBE_CONFIG: $BB_KUBE_CONFIG_DEV
46
38
  KUBECTL_COMMAND: 'set image deployment -l eturnityRepository=eturnity-3d main=$IMAGE_NAME --namespace=$NAMESPACE'
@@ -48,9 +40,7 @@ definitions:
48
40
  - step: &build_prod_and_push_image
49
41
  name: Build and push
50
42
  size: 2x
51
- script: &build_prod_and_push_image_script
52
- - set -e
53
- - export $(cat .env.namespace | xargs)
43
+ script:
54
44
  - export TAG=$BB_ETURNITY_VERSION-$BITBUCKET_BRANCH-$NAMESPACE-$BITBUCKET_COMMIT
55
45
  - echo "{\"version\":\"${BB_ETURNITY_VERSION}\",\"full_version\":\"${TAG}\"}" > ./src/assets/version.json
56
46
  - export RELEASE_TAG=latest
@@ -63,13 +53,12 @@ definitions:
63
53
  - docker
64
54
  caches:
65
55
  - docker
66
- - step: &deploy_to_prod_cluster
67
- name: Deploy to cluster
68
- script: &deploy_to_prod_cluster_script
69
- - export $(cat .env.namespace | xargs)
56
+ - step: &prod_deploy_only
57
+ name: Deploy to prod cluster
58
+ script:
70
59
  - export TAG=$BB_ETURNITY_VERSION-$BITBUCKET_BRANCH-$NAMESPACE-$BITBUCKET_COMMIT
71
60
  - export IMAGE_NAME=$BB_CONTAINER_REGISTRY/$BB_ETURNITY_HUB/$APPLICATION_NAME:$TAG
72
- - pipe: atlassian/kubectl-run:3.4.0
61
+ - pipe: atlassian/kubectl-run:3.7.0
73
62
  variables:
74
63
  KUBE_CONFIG: $BB_KUBE_CONFIG_PROD
75
64
  KUBECTL_COMMAND: 'set image deployment -l eturnityRepository=eturnity-3d main=$IMAGE_NAME --namespace=$NAMESPACE'
@@ -77,405 +66,799 @@ definitions:
77
66
  pipelines:
78
67
  custom:
79
68
  eturnity-prod-deploy:
69
+ - variables:
70
+ - name: NAMESPACE
71
+ default: "eturnity-prod"
72
+ allowed-values:
73
+ - "eturnity-prod"
80
74
  - step: *verify_prod_system
81
- - step:
82
- name: Build and push
83
- script:
84
- - printf "NAMESPACE=eturnity-prod" > .env.namespace
85
- after-script: *build_prod_and_push_image_script
86
- - step:
87
- name: Deploy
88
- script:
89
- - printf "NAMESPACE=eturnity-prod" > .env.namespace
90
- after-script: *deploy_to_prod_cluster_script
75
+ - step: *build_prod_and_push_image
76
+ - step: *prod_deploy_only
77
+
91
78
  staging-v.*.**.*:
92
- - step: *verify_staging_system
93
- - step: *build_and_push_image
94
- - step:
95
- name: Deploy
96
- script:
97
- - printf "NAMESPACE=staging-01" > .env.namespace
98
- after-script: *deploy_to_cluster_script
99
- - step:
100
- name: Deploy
101
- script:
102
- - printf "NAMESPACE=staging-02" > .env.namespace
103
- after-script: *deploy_to_cluster_script
104
- staging-01-deploy:
105
- - step: *verify_staging_system
106
- - step: *build_and_push_image
107
- - step:
108
- name: Deploy
109
- script:
110
- - printf "NAMESPACE=staging-01" > .env.namespace
111
- after-script: *deploy_to_cluster_script
112
- staging-02-deploy:
113
- - step: *verify_staging_system
114
- - step: *build_and_push_image
115
- - step:
116
- name: Deploy
117
- script:
118
- - printf "NAMESPACE=staging-02" > .env.namespace
119
- after-script: *deploy_to_cluster_script
120
- staging-03-deploy:
121
- - step: *verify_staging_system
122
- - step: *build_and_push_image
123
- - step:
124
- name: Deploy
125
- script:
126
- - printf "NAMESPACE=staging-03" > .env.namespace
127
- after-script: *deploy_to_cluster_script
128
- dev-master-deploy:
129
- - step: *build_and_push_image
130
- - step:
131
- name: Deploy
132
- script:
133
- - printf "NAMESPACE=dev-master" > .env.namespace
134
- after-script: *deploy_to_cluster_script
79
+ - variables:
80
+ - name: NAMESPACE
81
+ default: "staging-01"
82
+ allowed-values:
83
+ - "staging-01"
84
+ - "staging-02"
85
+ - "staging-03"
86
+ - step: *build_and_push_image
87
+ - step: *dev_deploy_only
88
+
89
+ ####################################################################################################################
90
+ ## DO NOT EDIT. GENERATED CODE
91
+ ## GENERATOR: templates/bb-pipeline-repo-eturnity-3d.yaml
92
+ ####################################################################################################################
93
+
94
+
135
95
  dev-01-deploy:
96
+ - variables:
97
+ - name: NAMESPACE
98
+ default: "dev-01"
99
+ allowed-values:
100
+ - "dev-01"
136
101
  - step: *build_and_push_image
137
- - step:
138
- name: Deploy
139
- script:
140
- - printf "NAMESPACE=dev-01" > .env.namespace
141
- after-script: *deploy_to_cluster_script
102
+ - step: *dev_deploy_only
103
+
142
104
  dev-02-deploy:
105
+ - variables:
106
+ - name: NAMESPACE
107
+ default: "dev-02"
108
+ allowed-values:
109
+ - "dev-02"
143
110
  - step: *build_and_push_image
144
- - step:
145
- name: Deploy
146
- script:
147
- - printf "NAMESPACE=dev-02" > .env.namespace
148
- after-script: *deploy_to_cluster_script
111
+ - step: *dev_deploy_only
112
+
149
113
  dev-03-deploy:
114
+ - variables:
115
+ - name: NAMESPACE
116
+ default: "dev-03"
117
+ allowed-values:
118
+ - "dev-03"
150
119
  - step: *build_and_push_image
151
- - step:
152
- name: Deploy
153
- script:
154
- - printf "NAMESPACE=dev-03" > .env.namespace
155
- after-script: *deploy_to_cluster_script
120
+ - step: *dev_deploy_only
121
+
156
122
  dev-04-deploy:
123
+ - variables:
124
+ - name: NAMESPACE
125
+ default: "dev-04"
126
+ allowed-values:
127
+ - "dev-04"
157
128
  - step: *build_and_push_image
158
- - step:
159
- name: Deploy
160
- script:
161
- - printf "NAMESPACE=dev-04" > .env.namespace
162
- after-script: *deploy_to_cluster_script
129
+ - step: *dev_deploy_only
130
+
163
131
  dev-05-deploy:
132
+ - variables:
133
+ - name: NAMESPACE
134
+ default: "dev-05"
135
+ allowed-values:
136
+ - "dev-05"
164
137
  - step: *build_and_push_image
165
- - step:
166
- name: Deploy
167
- script:
168
- - printf "NAMESPACE=dev-05" > .env.namespace
169
- after-script: *deploy_to_cluster_script
138
+ - step: *dev_deploy_only
139
+
170
140
  dev-06-deploy:
141
+ - variables:
142
+ - name: NAMESPACE
143
+ default: "dev-06"
144
+ allowed-values:
145
+ - "dev-06"
171
146
  - step: *build_and_push_image
172
- - step:
173
- name: Deploy
174
- script:
175
- - printf "NAMESPACE=dev-06" > .env.namespace
176
- after-script: *deploy_to_cluster_script
147
+ - step: *dev_deploy_only
148
+
177
149
  dev-07-deploy:
150
+ - variables:
151
+ - name: NAMESPACE
152
+ default: "dev-07"
153
+ allowed-values:
154
+ - "dev-07"
178
155
  - step: *build_and_push_image
179
- - step:
180
- name: Deploy
181
- script:
182
- - printf "NAMESPACE=dev-07" > .env.namespace
183
- after-script: *deploy_to_cluster_script
156
+ - step: *dev_deploy_only
157
+
184
158
  dev-08-deploy:
159
+ - variables:
160
+ - name: NAMESPACE
161
+ default: "dev-08"
162
+ allowed-values:
163
+ - "dev-08"
185
164
  - step: *build_and_push_image
186
- - step:
187
- name: Deploy
188
- script:
189
- - printf "NAMESPACE=dev-08" > .env.namespace
190
- after-script: *deploy_to_cluster_script
165
+ - step: *dev_deploy_only
166
+
191
167
  dev-09-deploy:
168
+ - variables:
169
+ - name: NAMESPACE
170
+ default: "dev-09"
171
+ allowed-values:
172
+ - "dev-09"
192
173
  - step: *build_and_push_image
193
- - step:
194
- name: Deploy
195
- script:
196
- - printf "NAMESPACE=dev-09" > .env.namespace
197
- after-script: *deploy_to_cluster_script
174
+ - step: *dev_deploy_only
175
+
198
176
  dev-10-deploy:
177
+ - variables:
178
+ - name: NAMESPACE
179
+ default: "dev-10"
180
+ allowed-values:
181
+ - "dev-10"
199
182
  - step: *build_and_push_image
200
- - step:
201
- name: Deploy
202
- script:
203
- - printf "NAMESPACE=dev-10" > .env.namespace
204
- after-script: *deploy_to_cluster_script
183
+ - step: *dev_deploy_only
184
+
205
185
  dev-11-deploy:
186
+ - variables:
187
+ - name: NAMESPACE
188
+ default: "dev-11"
189
+ allowed-values:
190
+ - "dev-11"
206
191
  - step: *build_and_push_image
207
- - step:
208
- name: Deploy
209
- script:
210
- - printf "NAMESPACE=dev-11" > .env.namespace
211
- after-script: *deploy_to_cluster_script
192
+ - step: *dev_deploy_only
193
+
212
194
  dev-12-deploy:
195
+ - variables:
196
+ - name: NAMESPACE
197
+ default: "dev-12"
198
+ allowed-values:
199
+ - "dev-12"
213
200
  - step: *build_and_push_image
214
- - step:
215
- name: Deploy
216
- script:
217
- - printf "NAMESPACE=dev-12" > .env.namespace
218
- after-script: *deploy_to_cluster_script
201
+ - step: *dev_deploy_only
202
+
219
203
  dev-13-deploy:
204
+ - variables:
205
+ - name: NAMESPACE
206
+ default: "dev-13"
207
+ allowed-values:
208
+ - "dev-13"
220
209
  - step: *build_and_push_image
221
- - step:
222
- name: Deploy
223
- script:
224
- - printf "NAMESPACE=dev-13" > .env.namespace
225
- after-script: *deploy_to_cluster_script
210
+ - step: *dev_deploy_only
211
+
226
212
  dev-14-deploy:
213
+ - variables:
214
+ - name: NAMESPACE
215
+ default: "dev-14"
216
+ allowed-values:
217
+ - "dev-14"
227
218
  - step: *build_and_push_image
228
- - step:
229
- name: Deploy
230
- script:
231
- - printf "NAMESPACE=dev-14" > .env.namespace
232
- after-script: *deploy_to_cluster_script
219
+ - step: *dev_deploy_only
220
+
233
221
  dev-15-deploy:
222
+ - variables:
223
+ - name: NAMESPACE
224
+ default: "dev-15"
225
+ allowed-values:
226
+ - "dev-15"
234
227
  - step: *build_and_push_image
235
- - step:
236
- name: Deploy
237
- script:
238
- - printf "NAMESPACE=dev-15" > .env.namespace
239
- after-script: *deploy_to_cluster_script
228
+ - step: *dev_deploy_only
229
+
240
230
  dev-16-deploy:
231
+ - variables:
232
+ - name: NAMESPACE
233
+ default: "dev-16"
234
+ allowed-values:
235
+ - "dev-16"
241
236
  - step: *build_and_push_image
242
- - step:
243
- name: Deploy
244
- script:
245
- - printf "NAMESPACE=dev-16" > .env.namespace
246
- after-script: *deploy_to_cluster_script
237
+ - step: *dev_deploy_only
238
+
247
239
  dev-17-deploy:
240
+ - variables:
241
+ - name: NAMESPACE
242
+ default: "dev-17"
243
+ allowed-values:
244
+ - "dev-17"
248
245
  - step: *build_and_push_image
249
- - step:
250
- name: Deploy
251
- script:
252
- - printf "NAMESPACE=dev-17" > .env.namespace
253
- after-script: *deploy_to_cluster_script
246
+ - step: *dev_deploy_only
247
+
254
248
  dev-18-deploy:
249
+ - variables:
250
+ - name: NAMESPACE
251
+ default: "dev-18"
252
+ allowed-values:
253
+ - "dev-18"
255
254
  - step: *build_and_push_image
256
- - step:
257
- name: Deploy
258
- script:
259
- - printf "NAMESPACE=dev-18" > .env.namespace
260
- after-script: *deploy_to_cluster_script
255
+ - step: *dev_deploy_only
256
+
261
257
  dev-19-deploy:
258
+ - variables:
259
+ - name: NAMESPACE
260
+ default: "dev-19"
261
+ allowed-values:
262
+ - "dev-19"
262
263
  - step: *build_and_push_image
263
- - step:
264
- name: Deploy
265
- script:
266
- - printf "NAMESPACE=dev-19" > .env.namespace
267
- after-script: *deploy_to_cluster_script
264
+ - step: *dev_deploy_only
265
+
268
266
  dev-20-deploy:
267
+ - variables:
268
+ - name: NAMESPACE
269
+ default: "dev-20"
270
+ allowed-values:
271
+ - "dev-20"
269
272
  - step: *build_and_push_image
270
- - step:
271
- name: Deploy
272
- script:
273
- - printf "NAMESPACE=dev-20" > .env.namespace
274
- after-script: *deploy_to_cluster_script
273
+ - step: *dev_deploy_only
274
+
275
+ dev-21-deploy:
276
+ - variables:
277
+ - name: NAMESPACE
278
+ default: "dev-21"
279
+ allowed-values:
280
+ - "dev-21"
281
+ - step: *build_and_push_image
282
+ - step: *dev_deploy_only
283
+
284
+ dev-22-deploy:
285
+ - variables:
286
+ - name: NAMESPACE
287
+ default: "dev-22"
288
+ allowed-values:
289
+ - "dev-22"
290
+ - step: *build_and_push_image
291
+ - step: *dev_deploy_only
292
+
293
+ dev-23-deploy:
294
+ - variables:
295
+ - name: NAMESPACE
296
+ default: "dev-23"
297
+ allowed-values:
298
+ - "dev-23"
299
+ - step: *build_and_push_image
300
+ - step: *dev_deploy_only
301
+
302
+ dev-24-deploy:
303
+ - variables:
304
+ - name: NAMESPACE
305
+ default: "dev-24"
306
+ allowed-values:
307
+ - "dev-24"
308
+ - step: *build_and_push_image
309
+ - step: *dev_deploy_only
310
+
311
+ dev-25-deploy:
312
+ - variables:
313
+ - name: NAMESPACE
314
+ default: "dev-25"
315
+ allowed-values:
316
+ - "dev-25"
317
+ - step: *build_and_push_image
318
+ - step: *dev_deploy_only
319
+
275
320
  qa-01-deploy:
321
+ - variables:
322
+ - name: NAMESPACE
323
+ default: "qa-01"
324
+ allowed-values:
325
+ - "qa-01"
276
326
  - step: *build_and_push_image
277
- - step:
278
- name: Deploy
279
- script:
280
- - printf "NAMESPACE=qa-01" > .env.namespace
281
- after-script: *deploy_to_cluster_script
327
+ - step: *dev_deploy_only
328
+
282
329
  qa-02-deploy:
330
+ - variables:
331
+ - name: NAMESPACE
332
+ default: "qa-02"
333
+ allowed-values:
334
+ - "qa-02"
283
335
  - step: *build_and_push_image
284
- - step:
285
- name: Deploy
286
- script:
287
- - printf "NAMESPACE=qa-02" > .env.namespace
288
- after-script: *deploy_to_cluster_script
336
+ - step: *dev_deploy_only
337
+
289
338
  qa-03-deploy:
339
+ - variables:
340
+ - name: NAMESPACE
341
+ default: "qa-03"
342
+ allowed-values:
343
+ - "qa-03"
290
344
  - step: *build_and_push_image
291
- - step:
292
- name: Deploy
293
- script:
294
- - printf "NAMESPACE=qa-03" > .env.namespace
295
- after-script: *deploy_to_cluster_script
345
+ - step: *dev_deploy_only
346
+
296
347
  qa-04-deploy:
348
+ - variables:
349
+ - name: NAMESPACE
350
+ default: "qa-04"
351
+ allowed-values:
352
+ - "qa-04"
297
353
  - step: *build_and_push_image
298
- - step:
299
- name: Deploy
300
- script:
301
- - printf "NAMESPACE=qa-04" > .env.namespace
302
- after-script: *deploy_to_cluster_script
354
+ - step: *dev_deploy_only
355
+
303
356
  qa-05-deploy:
357
+ - variables:
358
+ - name: NAMESPACE
359
+ default: "qa-05"
360
+ allowed-values:
361
+ - "qa-05"
304
362
  - step: *build_and_push_image
305
- - step:
306
- name: Deploy
307
- script:
308
- - printf "NAMESPACE=qa-05" > .env.namespace
309
- after-script: *deploy_to_cluster_script
363
+ - step: *dev_deploy_only
364
+
310
365
  qa-06-deploy:
366
+ - variables:
367
+ - name: NAMESPACE
368
+ default: "qa-06"
369
+ allowed-values:
370
+ - "qa-06"
311
371
  - step: *build_and_push_image
312
- - step:
313
- name: Deploy
314
- script:
315
- - printf "NAMESPACE=qa-06" > .env.namespace
316
- after-script: *deploy_to_cluster_script
372
+ - step: *dev_deploy_only
373
+
317
374
  qa-07-deploy:
375
+ - variables:
376
+ - name: NAMESPACE
377
+ default: "qa-07"
378
+ allowed-values:
379
+ - "qa-07"
318
380
  - step: *build_and_push_image
319
- - step:
320
- name: Deploy
321
- script:
322
- - printf "NAMESPACE=qa-07" > .env.namespace
323
- after-script: *deploy_to_cluster_script
381
+ - step: *dev_deploy_only
382
+
324
383
  qa-08-deploy:
384
+ - variables:
385
+ - name: NAMESPACE
386
+ default: "qa-08"
387
+ allowed-values:
388
+ - "qa-08"
325
389
  - step: *build_and_push_image
326
- - step:
327
- name: Deploy
328
- script:
329
- - printf "NAMESPACE=qa-08" > .env.namespace
330
- after-script: *deploy_to_cluster_script
390
+ - step: *dev_deploy_only
391
+
331
392
  qa-09-deploy:
393
+ - variables:
394
+ - name: NAMESPACE
395
+ default: "qa-09"
396
+ allowed-values:
397
+ - "qa-09"
332
398
  - step: *build_and_push_image
333
- - step:
334
- name: Deploy
335
- script:
336
- - printf "NAMESPACE=qa-09" > .env.namespace
337
- after-script: *deploy_to_cluster_script
399
+ - step: *dev_deploy_only
400
+
338
401
  qa-10-deploy:
402
+ - variables:
403
+ - name: NAMESPACE
404
+ default: "qa-10"
405
+ allowed-values:
406
+ - "qa-10"
339
407
  - step: *build_and_push_image
340
- - step:
341
- name: Deploy
342
- script:
343
- - printf "NAMESPACE=qa-10" > .env.namespace
344
- after-script: *deploy_to_cluster_script
408
+ - step: *dev_deploy_only
409
+
345
410
  qa-11-deploy:
411
+ - variables:
412
+ - name: NAMESPACE
413
+ default: "qa-11"
414
+ allowed-values:
415
+ - "qa-11"
346
416
  - step: *build_and_push_image
347
- - step:
348
- name: Deploy
349
- script:
350
- - printf "NAMESPACE=qa-11" > .env.namespace
351
- after-script: *deploy_to_cluster_script
417
+ - step: *dev_deploy_only
418
+
352
419
  qa-12-deploy:
420
+ - variables:
421
+ - name: NAMESPACE
422
+ default: "qa-12"
423
+ allowed-values:
424
+ - "qa-12"
353
425
  - step: *build_and_push_image
354
- - step:
355
- name: Deploy
356
- script:
357
- - printf "NAMESPACE=qa-12" > .env.namespace
358
- after-script: *deploy_to_cluster_script
426
+ - step: *dev_deploy_only
427
+
359
428
  qa-13-deploy:
429
+ - variables:
430
+ - name: NAMESPACE
431
+ default: "qa-13"
432
+ allowed-values:
433
+ - "qa-13"
360
434
  - step: *build_and_push_image
361
- - step:
362
- name: Deploy
363
- script:
364
- - printf "NAMESPACE=qa-13" > .env.namespace
365
- after-script: *deploy_to_cluster_script
435
+ - step: *dev_deploy_only
436
+
366
437
  qa-14-deploy:
438
+ - variables:
439
+ - name: NAMESPACE
440
+ default: "qa-14"
441
+ allowed-values:
442
+ - "qa-14"
367
443
  - step: *build_and_push_image
368
- - step:
369
- name: Deploy
370
- script:
371
- - printf "NAMESPACE=qa-14" > .env.namespace
372
- after-script: *deploy_to_cluster_script
444
+ - step: *dev_deploy_only
445
+
373
446
  qa-15-deploy:
447
+ - variables:
448
+ - name: NAMESPACE
449
+ default: "qa-15"
450
+ allowed-values:
451
+ - "qa-15"
374
452
  - step: *build_and_push_image
375
- - step:
376
- name: Deploy
377
- script:
378
- - printf "NAMESPACE=qa-15" > .env.namespace
379
- after-script: *deploy_to_cluster_script
453
+ - step: *dev_deploy_only
454
+
380
455
  qa-16-deploy:
456
+ - variables:
457
+ - name: NAMESPACE
458
+ default: "qa-16"
459
+ allowed-values:
460
+ - "qa-16"
381
461
  - step: *build_and_push_image
382
- - step:
383
- name: Deploy
384
- script:
385
- - printf "NAMESPACE=qa-16" > .env.namespace
386
- after-script: *deploy_to_cluster_script
462
+ - step: *dev_deploy_only
463
+
387
464
  qa-17-deploy:
465
+ - variables:
466
+ - name: NAMESPACE
467
+ default: "qa-17"
468
+ allowed-values:
469
+ - "qa-17"
388
470
  - step: *build_and_push_image
389
- - step:
390
- name: Deploy
391
- script:
392
- - printf "NAMESPACE=qa-17" > .env.namespace
393
- after-script: *deploy_to_cluster_script
471
+ - step: *dev_deploy_only
472
+
394
473
  qa-18-deploy:
474
+ - variables:
475
+ - name: NAMESPACE
476
+ default: "qa-18"
477
+ allowed-values:
478
+ - "qa-18"
395
479
  - step: *build_and_push_image
396
- - step:
397
- name: Deploy
398
- script:
399
- - printf "NAMESPACE=qa-18" > .env.namespace
400
- after-script: *deploy_to_cluster_script
480
+ - step: *dev_deploy_only
481
+
401
482
  qa-19-deploy:
483
+ - variables:
484
+ - name: NAMESPACE
485
+ default: "qa-19"
486
+ allowed-values:
487
+ - "qa-19"
402
488
  - step: *build_and_push_image
403
- - step:
404
- name: Deploy
405
- script:
406
- - printf "NAMESPACE=qa-19" > .env.namespace
407
- after-script: *deploy_to_cluster_script
489
+ - step: *dev_deploy_only
490
+
408
491
  qa-20-deploy:
492
+ - variables:
493
+ - name: NAMESPACE
494
+ default: "qa-20"
495
+ allowed-values:
496
+ - "qa-20"
409
497
  - step: *build_and_push_image
410
- - step:
411
- name: Deploy
412
- script:
413
- - printf "NAMESPACE=qa-20" > .env.namespace
414
- after-script: *deploy_to_cluster_script
498
+ - step: *dev_deploy_only
499
+
500
+ qa-21-deploy:
501
+ - variables:
502
+ - name: NAMESPACE
503
+ default: "qa-21"
504
+ allowed-values:
505
+ - "qa-21"
506
+ - step: *build_and_push_image
507
+ - step: *dev_deploy_only
508
+
509
+ qa-22-deploy:
510
+ - variables:
511
+ - name: NAMESPACE
512
+ default: "qa-22"
513
+ allowed-values:
514
+ - "qa-22"
515
+ - step: *build_and_push_image
516
+ - step: *dev_deploy_only
517
+
518
+ qa-23-deploy:
519
+ - variables:
520
+ - name: NAMESPACE
521
+ default: "qa-23"
522
+ allowed-values:
523
+ - "qa-23"
524
+ - step: *build_and_push_image
525
+ - step: *dev_deploy_only
526
+
527
+ qa-24-deploy:
528
+ - variables:
529
+ - name: NAMESPACE
530
+ default: "qa-24"
531
+ allowed-values:
532
+ - "qa-24"
533
+ - step: *build_and_push_image
534
+ - step: *dev_deploy_only
535
+
536
+ qa-25-deploy:
537
+ - variables:
538
+ - name: NAMESPACE
539
+ default: "qa-25"
540
+ allowed-values:
541
+ - "qa-25"
542
+ - step: *build_and_push_image
543
+ - step: *dev_deploy_only
544
+
415
545
  test-ext-01-deploy:
546
+ - variables:
547
+ - name: NAMESPACE
548
+ default: "test-ext-01"
549
+ allowed-values:
550
+ - "test-ext-01"
416
551
  - step: *build_and_push_image
417
- - step:
418
- name: Deploy
419
- script:
420
- - printf "NAMESPACE=test-ext-01" > .env.namespace
421
- after-script: *deploy_to_cluster_script
552
+ - step: *dev_deploy_only
553
+
422
554
  test-ext-02-deploy:
555
+ - variables:
556
+ - name: NAMESPACE
557
+ default: "test-ext-02"
558
+ allowed-values:
559
+ - "test-ext-02"
423
560
  - step: *build_and_push_image
424
- - step:
425
- name: Deploy
426
- script:
427
- - printf "NAMESPACE=test-ext-02" > .env.namespace
428
- after-script: *deploy_to_cluster_script
561
+ - step: *dev_deploy_only
562
+
429
563
  test-ext-03-deploy:
564
+ - variables:
565
+ - name: NAMESPACE
566
+ default: "test-ext-03"
567
+ allowed-values:
568
+ - "test-ext-03"
430
569
  - step: *build_and_push_image
431
- - step:
432
- name: Deploy
433
- script:
434
- - printf "NAMESPACE=test-ext-03" > .env.namespace
435
- after-script: *deploy_to_cluster_script
570
+ - step: *dev_deploy_only
571
+
436
572
  test-ext-04-deploy:
573
+ - variables:
574
+ - name: NAMESPACE
575
+ default: "test-ext-04"
576
+ allowed-values:
577
+ - "test-ext-04"
437
578
  - step: *build_and_push_image
438
- - step:
439
- name: Deploy
440
- script:
441
- - printf "NAMESPACE=test-ext-04" > .env.namespace
442
- after-script: *deploy_to_cluster_script
579
+ - step: *dev_deploy_only
580
+
443
581
  test-ext-05-deploy:
582
+ - variables:
583
+ - name: NAMESPACE
584
+ default: "test-ext-05"
585
+ allowed-values:
586
+ - "test-ext-05"
444
587
  - step: *build_and_push_image
445
- - step:
446
- name: Deploy
447
- script:
448
- - printf "NAMESPACE=test-ext-05" > .env.namespace
449
- after-script: *deploy_to_cluster_script
588
+ - step: *dev_deploy_only
589
+
590
+ staging-01-deploy:
591
+ - variables:
592
+ - name: NAMESPACE
593
+ default: "staging-01"
594
+ allowed-values:
595
+ - "staging-01"
596
+ - step: *build_and_push_image
597
+ - step: *dev_deploy_only
598
+
599
+ staging-02-deploy:
600
+ - variables:
601
+ - name: NAMESPACE
602
+ default: "staging-02"
603
+ allowed-values:
604
+ - "staging-02"
605
+ - step: *build_and_push_image
606
+ - step: *dev_deploy_only
450
607
 
451
608
  qa-ext-01-deploy:
609
+ - variables:
610
+ - name: NAMESPACE
611
+ default: "qa-ext-01"
612
+ allowed-values:
613
+ - "qa-ext-01"
452
614
  - step: *build_and_push_image
453
- - step:
454
- name: Deploy
455
- script:
456
- - printf "NAMESPACE=qa-ext-01" > .env.namespace
457
- after-script: *deploy_to_cluster_script
615
+ - step: *dev_deploy_only
458
616
 
459
617
  qa-ext-02-deploy:
618
+ - variables:
619
+ - name: NAMESPACE
620
+ default: "qa-ext-02"
621
+ allowed-values:
622
+ - "qa-ext-02"
460
623
  - step: *build_and_push_image
461
- - step:
462
- name: Deploy
463
- script:
464
- - printf "NAMESPACE=qa-ext-02" > .env.namespace
465
- after-script: *deploy_to_cluster_script
624
+ - step: *dev_deploy_only
466
625
 
467
626
  qa-ext-03-deploy:
627
+ - variables:
628
+ - name: NAMESPACE
629
+ default: "qa-ext-03"
630
+ allowed-values:
631
+ - "qa-ext-03"
468
632
  - step: *build_and_push_image
469
- - step:
470
- name: Deploy
471
- script:
472
- - printf "NAMESPACE=qa-ext-03" > .env.namespace
473
- after-script: *deploy_to_cluster_script
633
+ - step: *dev_deploy_only
474
634
 
475
635
  qa-ext-04-deploy:
636
+ - variables:
637
+ - name: NAMESPACE
638
+ default: "qa-ext-04"
639
+ allowed-values:
640
+ - "qa-ext-04"
476
641
  - step: *build_and_push_image
642
+ - step: *dev_deploy_only
643
+
644
+
645
+ deploy:
646
+ - variables:
647
+ - name: NAMESPACE
648
+ default: "dev-01"
649
+ allowed-values:
650
+
651
+
652
+ - "dev-01"
653
+
654
+
655
+ - "dev-02"
656
+
657
+
658
+ - "dev-03"
659
+
660
+
661
+ - "dev-04"
662
+
663
+
664
+ - "dev-05"
665
+
666
+
667
+ - "dev-06"
668
+
669
+
670
+ - "dev-07"
671
+
672
+
673
+ - "dev-08"
674
+
675
+
676
+ - "dev-09"
677
+
678
+
679
+ - "dev-10"
680
+
681
+
682
+ - "dev-11"
683
+
684
+
685
+ - "dev-12"
686
+
687
+
688
+ - "dev-13"
689
+
690
+
691
+ - "dev-14"
692
+
693
+
694
+ - "dev-15"
695
+
696
+
697
+ - "dev-16"
698
+
699
+
700
+ - "dev-17"
701
+
702
+
703
+ - "dev-18"
704
+
705
+
706
+ - "dev-19"
707
+
708
+
709
+ - "dev-20"
710
+
711
+
712
+ - "dev-21"
713
+
714
+
715
+ - "dev-22"
716
+
717
+
718
+ - "dev-23"
719
+
720
+
721
+ - "dev-24"
722
+
723
+
724
+ - "dev-25"
725
+
726
+
727
+ - "qa-01"
728
+
729
+
730
+ - "qa-02"
731
+
732
+
733
+ - "qa-03"
734
+
735
+
736
+ - "qa-04"
737
+
738
+
739
+ - "qa-05"
740
+
741
+
742
+ - "qa-06"
743
+
744
+
745
+ - "qa-07"
746
+
747
+
748
+ - "qa-08"
749
+
750
+
751
+ - "qa-09"
752
+
753
+
754
+ - "qa-10"
755
+
756
+
757
+ - "qa-11"
758
+
759
+
760
+ - "qa-12"
761
+
762
+
763
+ - "qa-13"
764
+
765
+
766
+ - "qa-14"
767
+
768
+
769
+ - "qa-15"
770
+
771
+
772
+ - "qa-16"
773
+
774
+
775
+ - "qa-17"
776
+
777
+
778
+ - "qa-18"
779
+
780
+
781
+ - "qa-19"
782
+
783
+
784
+ - "qa-20"
785
+
786
+
787
+ - "qa-21"
788
+
789
+
790
+ - "qa-22"
791
+
792
+
793
+ - "qa-23"
794
+
795
+
796
+ - "qa-24"
797
+
798
+
799
+ - "qa-25"
800
+
801
+
802
+ - "test-ext-01"
803
+
804
+
805
+ - "test-ext-02"
806
+
807
+
808
+ - "test-ext-03"
809
+
810
+
811
+ - "test-ext-04"
812
+
813
+
814
+ - "test-ext-05"
815
+
816
+
817
+
818
+
819
+ - "qa-ext-01"
820
+
821
+
822
+ - "qa-ext-02"
823
+
824
+
825
+ - "qa-ext-03"
826
+
827
+
828
+ - "qa-ext-04"
829
+
830
+ - step: *build_and_push_image
831
+ - step: *dev_deploy_only
832
+ staging-all:
833
+ - parallel:
834
+
477
835
  - step:
478
- name: Deploy
479
- script:
480
- - printf "NAMESPACE=qa-ext-04" > .env.namespace
481
- after-script: *deploy_to_cluster_script
836
+ name: Deploy to staging-01
837
+ script:
838
+ - pipe: atlassian/trigger-pipeline:5.2.0
839
+ variables:
840
+ BITBUCKET_ACCESS_TOKEN: $BB_ETURNITY_DEPLOY_ACCESS_TOKEN_1
841
+ REPOSITORY: 'eturnity_expert'
842
+ CUSTOM_PIPELINE_NAME: 'staging-01-deploy'
843
+ REF_TYPE: 'branch'
844
+ REF_NAME: 'staging-v.${BB_STAGING_VERSION}'
845
+ DEBUG: 'true'
846
+ WAIT: 'true'
847
+
848
+ - step:
849
+ name: Deploy to staging-02
850
+ script:
851
+ - pipe: atlassian/trigger-pipeline:5.2.0
852
+ variables:
853
+ BITBUCKET_ACCESS_TOKEN: $BB_ETURNITY_DEPLOY_ACCESS_TOKEN_1
854
+ REPOSITORY: 'eturnity_expert'
855
+ CUSTOM_PIPELINE_NAME: 'staging-02-deploy'
856
+ REF_TYPE: 'branch'
857
+ REF_NAME: 'staging-v.${BB_STAGING_VERSION}'
858
+ DEBUG: 'true'
859
+ WAIT: 'true'
860
+
861
+
862
+ ####################################################################################################################
863
+ ## END GENERATED SECTION
864
+ ####################################################################################################################
package/package.json CHANGED
@@ -1,14 +1,14 @@
1
1
  {
2
2
  "name": "@eturnity/eturnity_3d",
3
3
  "private": false,
4
- "version": "6.33.0",
4
+ "version": "6.34.0",
5
5
  "main": "dist/main.js",
6
6
  "scripts": {
7
7
  "dev": "vue-cli-service serve --skip-plugins @vue/cli-plugin-eslint",
8
8
  "build": "vue-cli-service build --skip-plugins @vue/cli-plugin-eslint"
9
9
  },
10
10
  "dependencies": {
11
- "@eturnity/eturnity_maths": "6.33.0",
11
+ "@eturnity/eturnity_maths": "6.34.0",
12
12
  "axios": "^1.3.2",
13
13
  "core-js": "^2.6.12",
14
14
  "cors": "^2.8.5",
@@ -69,4 +69,4 @@
69
69
  "> 1%",
70
70
  "last 2 versions"
71
71
  ]
72
- }
72
+ }
@@ -184,11 +184,15 @@ export default {
184
184
  //if flat roof=> go south
185
185
  horizontalVector.y = 1
186
186
  }
187
- cameraMoveVector = multiplyVector(distance * 2000, horizontalVector)
187
+ let distanceCoefficient = 2
188
+ if(flatRoof){
189
+ distanceCoefficient = 1.5
190
+ }
191
+ cameraMoveVector = multiplyVector(distance * 1000 * distanceCoefficient, horizontalVector)
188
192
  }
189
193
 
190
194
  const positionVector = addVector(polygonRef.meanPoint, cameraMoveVector)
191
- if(flatRoof) positionVector.z+=2000
195
+ if(flatRoof) positionVector.z+=3000
192
196
  const position = [
193
197
  positionVector.x / 1000,
194
198
  positionVector.y / 1000 - 1,