issue-214 Refactoring Gitlab CI/CD pipeline

fix: cmd_prefix benchmark-dependencies

fix: bash instruction

fix: fixing launching dev and storybook inside ci/cd pipeline

refactor: deleting unused code

ci: making gitlab pages job manual

refactor: fixing typo in gitlab-ci.yml

fix: disk name in influx query

fix: disk-io name delete

refactor: refactoring overall file names
chore: update to version 1.5.0

Author: yacoubii

.gitlab-ci.yml

@@ -5,82 +5,8 @@ stages:
 
 .install-dependencies:
   before_script:
-    - apt update -y
-    - apt install curl -y
-    - apt install git -y
-    - git --version
     - yarn install
 
-.install-node-yarn-dependencies:
-  before_script:
-    - apt update -y
-    - apt install git -y
-    - apt install -y sudo curl
-    - curl --version
-    - curl -sL https://deb.nodesource.com/setup_lts.x | sudo -E bash -
-    - sudo apt install -y nodejs
-    - node -v
-    - curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
-    - echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
-    - sudo apt update && sudo apt install -y yarn
-    - yarn install
-
-default:
-  image: node:18.18-alpine
-
-build-dev:
-  stage: build
-  before_script:
-    - export CI_BENCHMARK=remote_data
-    - export PALINDROME_TYPE=basic
-  script:
-    - yarn install --ignore-scripts
-    - |
-      yarn parcel dev/index.html --no-cache &
-      until curl -s http://localhost:1234 > /dev/null; do
-        echo "Waiting for Parcel server..."
-        sleep 1
-      done
-    - cd services/tsdbService
-    - yarn install
-    - yarn build
-  artifacts:
-    paths:
-      - "dist/"
-  allow_failure: false
-  when: manual
-
-build-storybook:
-  stage: build
-  before_script:
-    - apk update
-    - apk add bash
-    - apk add git
-  script:
-    - yarn install
-    - 'file_path="stories/oth.stories.js"'
-    - 'start_pattern="export const localLiveMonitoring"'
-    - 'end_pattern="fetchFunction: localMonitoring.*};"'
-    - 'sed -i "/$start_pattern/,/$end_pattern/d" "$file_path"' 
-    - yarn build-storybook
-  artifacts:
-    paths:
-      - "storybook-static/"
-  allow_failure: false
-  when: manual
-
-cypress-test:
-  stage: test
-  extends: .install-dependencies
-  dependencies: []
-  image: cypress/base:latest
-  script:
-    - yarn storybook &
-    - yarn dev &
-    - rm -rf cypress/match-screenshots/ .cache/
-    - for i in 1 2; do yarn cypress:run; done
-  allow_failure: false
-
 .launch-benchmark-remote-data:
   stage: test
   image: ghcr.io/puppeteer/puppeteer:latest 
@@ -112,9 +38,24 @@ cypress-test:
       done
     - cd ../..
     - node "$BENCHMARK_SCRIPT"
+  allow_failure: true
+
+default:
+  image: node:18.18-alpine
+
+cypress-test:
+  stage: test
+  extends: .install-dependencies
+  dependencies: []
+  image: cypress/base:latest
+  script:
+    - export NODE_OPTIONS=--openssl-legacy-provider & yarn run start-storybook -p 6006 &
+    - yarn run cross-env PALINDROME_TYPE=dev parcel dev/index.html --no-cache &
+    - rm -rf cypress/match-screenshots/ .cache/
+    - for i in 1 2; do yarn cypress:run; done
   allow_failure: false
 
-initial_remote-data-benchmark:
+initial-remote-data-benchmark:
   extends: .launch-benchmark-remote-data
   before_script:
     - export CI_BENCHMARK=remote_data
@@ -129,23 +70,61 @@ remote-data-update-multiviewport-benchmark:
     - export BENCHMARK_SCRIPT=./scripts/remoteDataBenchmark/multiViewportBenchmark.js
 
 benchmark:
-  image: ubuntu:20.04
+  image: cimg/node:18.0
   stage: test
   dependencies: []
-  extends: .install-node-yarn-dependencies
+  before_script:
+    - sudo chown -R $(whoami):$(whoami) .
+    - !reference [.install-dependencies, before_script]
   script:
     - /bin/bash ./scripts/benchmark.sh "classic"
   allow_failure: false
 
 benchmark-test:
-  image: ubuntu:20.04
+  image: cimg/node:18.0
   stage: test
   dependencies: []
-  extends: .install-node-yarn-dependencies
+  before_script:
+    - sudo chown -R $(whoami):$(whoami) .
+    - !reference [.install-dependencies, before_script]
   script:
     - /bin/bash ./scripts/benchmark.sh "evaluation"
   allow_failure: false
 
+build-dev:
+  stage: build
+  before_script:
+    - apk update
+    - apk add bash
+    - apk add git
+  script:
+    - yarn install
+    - yarn build
+  artifacts:
+    paths:
+      - "dist/"
+  allow_failure: false
+
+build-storybook:
+  stage: build
+  before_script:
+    - apk update
+    - apk add bash
+    - apk add git
+  script:
+    - yarn install
+    - rm -rf stories/remote.stories.js
+    - file_path="stories/oth.stories.js"
+    - sed -i '/export const localLiveMonitoring = createPalindrome.bind({});/,/};/d' $file_path
+    - file_path="stories/mvp.stories.js"
+    - sed -i "/export const hybridMultiviewport = createMultipleViewPorts.bind({});/,/};/d" "$file_path"
+    - sed -i "/export const benchmarkMultiviewport = createMultipleViewPorts.bind({});/,/};/d" "$file_path"
+    - yarn build-storybook
+  artifacts:
+    paths:
+      - "storybook-static/"
+  allow_failure: false
+
 pages:
   stage: deploy
   image: busybox
@@ -157,6 +136,7 @@ pages:
     paths:
       - "public/"
   allow_failure: false
+  when: manual
 
 gh-pages:
   stage: deploy

cypress/e2e/dev/remote_data_sources.cy.js

@@ -1,5 +1,5 @@
-import { heavyRemoteSchema } from "./heavy_remote_data"
-import { remoteSchema } from "./remote_data"
+import { heavyRemoteSchema } from "./remote_heavyRemoteData"
+import { remoteSchema } from "./remote_remoteData"
 
 const remoteData = {
     title: 'Remote Data',

cypress/fixtures/snapshots/actual/dev/remote_data_sources.cy.js/[DEV] Remote data sources -- should render remote data sources use cases (failed).png

@@ -1,5 +1,5 @@
-import { heavyRemoteSchema } from "./heavy_remote_data"
-import { remoteSchema } from "./remote_data"
+import { heavyRemoteSchema } from "./remote_heavyRemoteData"
+import { remoteSchema } from "./remote_remoteData"
 
 export const benchmarkRemoteData = () => {
     return {

data-examples/mvpBenchGenerator.js

@@ -3,8 +3,8 @@ import { dcEnergeticEfficiency } from "./dc_EnergeticEfficiency"
 import { dcFullMap } from "./dc_FullMap"
 import { debugTwoLayersFourPoints } from "./debug_TwoLayersFourPoints"
 import { debugTwoLayersThreePoints } from "./debug_TwoLayersThreePoints"
-import { heavyRemoteSchema } from "./heavy_remote_data"
-import { remoteSchema } from "./remote_data"
+import { heavyRemoteSchema } from "./remote_heavyRemoteData"
+import { remoteSchema } from "./remote_remoteData"
 
 export const hybridMultiplePalindromes = () => {
     return {

data-examples/mvp_benchmarkGridRemoteData.js

@@ -43,7 +43,7 @@ export function heavyRemoteSchema() {
                 label: 'Disk Weighted IO Time',
                 unit: 'MS',
                 id: 'diskWIOT-id',
-                query: 'from(bucket: "Palindrome.js") |> range(start:-1m) |> filter(fn: (r) => r["_measurement"] == "diskio") |> filter(fn: (r) => r["_field"] == "weighted_io_time") |> filter(fn: (r) => r["name"] == "sda")',
+                query: 'from(bucket: "Palindrome.js") |> range(start:-1m) |> filter(fn: (r) => r["_measurement"] == "diskio") |> filter(fn: (r) => r["_field"] == "weighted_io_time") ',
                 ranges: [0, 500, 1000],
                 dataProviderId: "influxdb-1",
                 remoteDataFetchPace: 6000
@@ -52,7 +52,7 @@ export function heavyRemoteSchema() {
                 label: 'Disk Write Time',
                 unit: 'MS',
                 id: 'diskWT-id',
-                query: 'from(bucket: "Palindrome.js")  |> range(start:-1m) |> filter(fn: (r) => r["_measurement"] == "diskio")  |> filter(fn: (r) => r["_field"] == "write_time")  |> filter(fn: (r) => r["name"] == "sda")',
+                query: 'from(bucket: "Palindrome.js")  |> range(start:-1m) |> filter(fn: (r) => r["_measurement"] == "diskio")  |> filter(fn: (r) => r["_field"] == "write_time")  ',
                 ranges: [0, 500, 1000],
                 dataProviderId: "influxdb-1"
             },
@@ -148,7 +148,7 @@ export function heavyRemoteSchema() {
                 label: 'Disk Weighted IO Time',
                 unit: 'MS',
                 id: 'diskWIOT-id2',
-                query: 'from(bucket: "Palindrome.js") |> range(start:-1m) |> filter(fn: (r) => r["_measurement"] == "diskio") |> filter(fn: (r) => r["_field"] == "weighted_io_time") |> filter(fn: (r) => r["name"] == "sda")',
+                query: 'from(bucket: "Palindrome.js") |> range(start:-1m) |> filter(fn: (r) => r["_measurement"] == "diskio") |> filter(fn: (r) => r["_field"] == "weighted_io_time") ',
                 ranges: [0, 500, 1000],
                 dataProviderId: "influxdb-1",
                 remoteDataFetchPace: 6000
@@ -157,7 +157,7 @@ export function heavyRemoteSchema() {
                 label: 'Disk Write Time',
                 unit: 'MS',
                 id: 'diskWT-id2',
-                query: 'from(bucket: "Palindrome.js")  |> range(start:-1m) |> filter(fn: (r) => r["_measurement"] == "diskio")  |> filter(fn: (r) => r["_field"] == "write_time")  |> filter(fn: (r) => r["name"] == "sda")',
+                query: 'from(bucket: "Palindrome.js")  |> range(start:-1m) |> filter(fn: (r) => r["_measurement"] == "diskio")  |> filter(fn: (r) => r["_field"] == "write_time")  ',
                 ranges: [0, 500, 1000],
                 dataProviderId: "influxdb-1"
             },
@@ -253,7 +253,7 @@ export function heavyRemoteSchema() {
                 label: 'Disk Weighted IO Time',
                 unit: 'MS',
                 id: 'diskWIOT-id3',
-                query: 'from(bucket: "Palindrome.js") |> range(start:-1m) |> filter(fn: (r) => r["_measurement"] == "diskio") |> filter(fn: (r) => r["_field"] == "weighted_io_time") |> filter(fn: (r) => r["name"] == "sda")',
+                query: 'from(bucket: "Palindrome.js") |> range(start:-1m) |> filter(fn: (r) => r["_measurement"] == "diskio") |> filter(fn: (r) => r["_field"] == "weighted_io_time") ',
                 ranges: [0, 500, 1000],
                 dataProviderId: "influxdb-1",
                 remoteDataFetchPace: 6000
@@ -262,7 +262,7 @@ export function heavyRemoteSchema() {
                 label: 'Disk Write Time',
                 unit: 'MS',
                 id: 'diskWT-id3',
-                query: 'from(bucket: "Palindrome.js")  |> range(start:-1m) |> filter(fn: (r) => r["_measurement"] == "diskio")  |> filter(fn: (r) => r["_field"] == "write_time")  |> filter(fn: (r) => r["name"] == "sda")',
+                query: 'from(bucket: "Palindrome.js")  |> range(start:-1m) |> filter(fn: (r) => r["_measurement"] == "diskio")  |> filter(fn: (r) => r["_field"] == "write_time")  ',
                 ranges: [0, 500, 1000],
                 dataProviderId: "influxdb-1"
             },
@@ -358,7 +358,7 @@ export function heavyRemoteSchema() {
                 label: 'Disk Weighted IO Time',
                 unit: 'MS',
                 id: 'diskWIOT-id4',
-                query: 'from(bucket: "Palindrome.js") |> range(start:-1m) |> filter(fn: (r) => r["_measurement"] == "diskio") |> filter(fn: (r) => r["_field"] == "weighted_io_time") |> filter(fn: (r) => r["name"] == "sda")',
+                query: 'from(bucket: "Palindrome.js") |> range(start:-1m) |> filter(fn: (r) => r["_measurement"] == "diskio") |> filter(fn: (r) => r["_field"] == "weighted_io_time") ',
                 ranges: [0, 500, 1000],
                 dataProviderId: "influxdb-1",
                 remoteDataFetchPace: 6000
@@ -367,7 +367,7 @@ export function heavyRemoteSchema() {
                 label: 'Disk Write Time',
                 unit: 'MS',
                 id: 'diskWT-id4',
-                query: 'from(bucket: "Palindrome.js")  |> range(start:-1m) |> filter(fn: (r) => r["_measurement"] == "diskio")  |> filter(fn: (r) => r["_field"] == "write_time")  |> filter(fn: (r) => r["name"] == "sda")',
+                query: 'from(bucket: "Palindrome.js")  |> range(start:-1m) |> filter(fn: (r) => r["_measurement"] == "diskio")  |> filter(fn: (r) => r["_field"] == "write_time")  ',
                 ranges: [0, 500, 1000],
                 dataProviderId: "influxdb-1"
             },

data-examples/mvp_hybridMultiplePalindromes.js

@@ -43,7 +43,7 @@ export function remoteSchema() {
                 label: 'Disk Weighted IO Time',
                 unit: 'MS',
                 id: 'diskWIOT-id',
-                query: 'from(bucket: "Palindrome.js") |> range(start:-1m) |> filter(fn: (r) => r["_measurement"] == "diskio") |> filter(fn: (r) => r["_field"] == "weighted_io_time") |> filter(fn: (r) => r["name"] == "sda")',
+                query: 'from(bucket: "Palindrome.js") |> range(start:-1m) |> filter(fn: (r) => r["_measurement"] == "diskio") |> filter(fn: (r) => r["_field"] == "weighted_io_time") ',
                 ranges: [0, 500, 1000],
                 dataProviderId: "influxdb-1",
                 remoteDataFetchPace: 6000
@@ -52,7 +52,7 @@ export function remoteSchema() {
                 label: 'Disk Write Time',
                 unit: 'MS',
                 id: 'diskWT-id',
-                query: 'from(bucket: "Palindrome.js")  |> range(start:-1m) |> filter(fn: (r) => r["_measurement"] == "diskio")  |> filter(fn: (r) => r["_field"] == "write_time")  |> filter(fn: (r) => r["name"] == "sda")',
+                query: 'from(bucket: "Palindrome.js")  |> range(start:-1m) |> filter(fn: (r) => r["_measurement"] == "diskio")  |> filter(fn: (r) => r["_field"] == "write_time")',
                 ranges: [0, 500, 1000],
                 dataProviderId: "influxdb-1"
             },

data-examples/heavy_remote_data.js data-examples/remote_heavyRemoteData.js

@@ -11,8 +11,8 @@ import { logicFiveThreeTwo } from "../../data-examples/logic_FiveThreeTwo";
 import { logicFourValued } from "../../data-examples/logic_FourValued";
 import { logicTernary } from "../../data-examples/logic_Ternary";
 import { pyramidOfMaslows } from "../../data-examples/oth_pyramid_of_maslows";
-import { remoteSchema } from "../../data-examples/remote_data";
-import { heavyRemoteSchema } from "../../data-examples/heavy_remote_data";
+import { remoteSchema } from "../../data-examples/remote_remoteData";
+import { heavyRemoteSchema } from "../../data-examples/remote_heavyRemoteData";
 import { remoteSchemaValidator } from "../../src/utils/dataStructureValidationUtils";
 import { hybridMultiplePalindromes } from "../../data-examples/mvp_hybridMultiplePalindromes";
 import { openMeteo } from "../../data-examples/oth_api_open_meteo_com";

data-examples/remote_data.js data-examples/remote_remoteData.js

@@ -1,6 +1,6 @@
 {
   "name": "@smile/palindrome.js",
-  "version": "1.0.9",
+  "version": "1.5.0",
   "homepage": "https://Smile-SA.github.io/palindrome.js",
   "description": "3D monitoring for metrics and KPIs",
   "default": "index.html",

dev/utils/controls.js

@@ -2,11 +2,8 @@
 
 # Set sudo prefix depending on situation
 declare -g cmd_prefix
-if [[ -n "${GITLAB_CI}" ]]; then
-    cmd_prefix=""
-else
-    cmd_prefix="sudo"
-fi
+
+cmd_prefix="sudo"
 
 # Update the package manager
 ${cmd_prefix} apt update -y

package.json

@@ -1,4 +1,4 @@
-import { remoteSchema } from "../data-examples/remote_data.js";
+import { remoteSchema } from "../data-examples/remote_remoteData.js";
 import { fetchFromDataProviders } from "../src/utils/fetchUtils.js";
 import { writeFile } from 'fs/promises';