chore(CI): contourne les nouvelles contraintes de la CI (!1660)

.gitlab/ci/doc.yml

 doc/build-image:
-  stage: build
+  # On le met au début car c'est utilisé dans les tests de storybook
+  stage: prepare
   needs: []
   extends:
     - .rule-build-and-push
@@ -7,4 +8,4 @@ doc/build-image:
   image:
     name: gcr.io/kaniko-project/executor:debug
     entrypoint: [""]
-  script: /kaniko/executor --context "$CI_PROJECT_DIR" --build-arg GIT_SHA=${CI_COMMIT_SHA} --dockerfile "$CI_PROJECT_DIR/Dockerfile.docs" --destination "caminofr/camino-docs:${CI_COMMIT_SHA}" ${KANIKO_POST_PARAM}
+  script: /kaniko/executor --context "$CI_PROJECT_DIR" --build-arg GIT_SHA=${CI_COMMIT_SHA} --dockerfile "$CI_PROJECT_DIR/Dockerfile.docs" --destination "caminofr/camino-docs:${CI_COMMIT_SHA}"

.gitlab/ci/ui.yml

@@ -10,8 +10,11 @@ ui/test-storybook:
   extends: .prepare-node-run
   stage: test
   retry: 2
+  services:
+    - name: caminofr/camino-docs:${CI_COMMIT_SHA}
+      alias: storybook
   script:
-    - make storybook/build
+    - ./.gitlab/wait-for-it.sh -h localhost -p 80 -t 60 -- echo 'done'
     - make storybook/test
 ui/build-and-push-image:
   stage: build

Makefile

@@ -57,8 +57,7 @@ storybook/test:
 ifndef CI
 	npm run storybook:test -w packages/ui
 else
-# TODO 2024-07-04 on peut surement mieux faire, avec un sidecar
-	npx concurrently -k -s first -n "SB,TEST" -c "magenta,blue" "npx http-server packages/ui/storybook-static --port 6006 --silent"  "npx wait-on tcp:6006 && npm run storybook:test -w packages/ui"
+	npm run storybook:test -w packages/ui -- --url http://localhost/storybook/
 endif
 
 test/common:

knip.ts

@@ -42,6 +42,7 @@ const config = {
         "@vitest/coverage-v8",
         "eslint-config-prettier",
         "eslint-plugin-promise",
+        "vite",
       ],
     },
     "packages/common": {

packages/api/package.json

@@ -29,8 +29,8 @@
     "lint": "prettier --write . && eslint --fix .",
     "start": "node --enable-source-maps --loader ts-node/esm/transpile-only ./src/index.ts",
     "test": "vitest",
-    "test:unit": "vitest --project unit",
-    "test:integration": "vitest --project integration",
+    "test:unit": "vitest --config ./vitest.unit.config.ts",
+    "test:integration": "vitest --config ./vitest.integration.config.ts",
     "test:generate-data": "node --enable-source-maps --loader ts-node/esm/transpile-only src/tools/demarches/tests-creation.ts",
     "test:generate-phase-data": "node --enable-source-maps --loader ts-node/esm/transpile-only src/tools/phases/tests-creation.ts",
     "test:generate-matrices-data": "node --enable-source-maps --loader ts-node/esm/transpile-only src/tools/matrices/tests-creation.ts",

packages/api/vitest.integration.config.ts

+/// <reference types="vitest" />
+import { defineConfig } from 'vite'
+import { testEnv } from './test-env'
+import path from 'path'
+const poolOptions =
+  process.env.CI === 'true'
+    ? {
+        poolOptions: {
+          threads: {
+            minThreads: 1,
+            maxThreads: 5,
+          },
+        },
+      }
+    : {}
+export default defineConfig({
+  test: {
+    environment: 'node',
+    root: 'src/',
+    name: 'integration',
+    include: ['**/*.test.integration.ts'],
+    setupFiles: path.resolve(__dirname, './tests/vitestSetup.ts'),
+    testTimeout: 10000,
+    hookTimeout: 45000,
+    env: testEnv,
+    pool: 'threads',
+    ...poolOptions,
+  },
+})

packages/api/vitest.unit.config.ts

+import { defineConfig } from 'vitest/config'
+import path from 'path'
+import { testEnv } from './test-env'
+
+export default defineConfig({
+  test: {
+    environment: 'node',
+    root: 'src/',
+    setupFiles: path.resolve(__dirname, './tests/vitestSetup.ts'),
+    env: testEnv,
+  },
+})

packages/api/vitest.workspace.ts

-import { defineWorkspace } from 'vitest/config'
-import path from 'path'
-import { testEnv } from './test-env'
-
-export default defineWorkspace([
-  {
-    test: {
-      setupFiles: path.resolve(__dirname, './tests/vitestSetup.ts'),
-      env: testEnv,
-      environment: 'node',
-      pool: 'threads',
-      root: 'src',
-      name: 'unit',
-    },
-  },
-  {
-    test: {
-      name: 'integration',
-      include: ['**/*.test.integration.ts'],
-      setupFiles: path.resolve(__dirname, './tests/vitestSetup.ts'),
-      testTimeout: 10000,
-      hookTimeout: 45000,
-      env: testEnv,
-    },
-  },
-])