Merge remote-tracking branch 'origin/dev' into feature/experiment-logs-tab

Author: danoswaltCL

.husky/pre-commit

@@ -4,9 +4,7 @@
 npx lint-staged
 
 # Typecheck Frontend
-cd frontend
-npm run typecheck
+yarn workspace upgrade-frontend typecheck
 
 # Typecheck Backend Upgrade
-cd ../backend/packages/Upgrade
-npm start typecheck
+yarn workspace upgrade-backend typecheck

.jenkins/projectBuilder.Jenkinsfile

@@ -2,40 +2,29 @@ projectBuilderV5 (
     buildAgent:[
         taskDefinitionOverride: "upgrade-ci"
     ],
-
+    initScripts: [
+        [
+            script: 'npx yarn',
+            log: 'yarn-install.log'
+        ]
+    ],
     projects: [
-        "types": [
-            artifactType: "codeartifact",
-            projectDir: "types",
-            runInProjectDir: true,
-            skipArtifactUpload: true,
-            fileFilter: [
-                include: ["types/.*"]
-            ],
-            buildScripts: [
-                [
-                    script: 'npm ci --no-audit',
-                    githubCheck: 'types npm ci --no-audit',
-                    log: 'types-npm-ci.log'
-                ]
-            ]
-        ],
         "upgrade-service":[
             artifactType: "ecr",
-            projectDir: "backend",
+            projectDir: ".",
             runInProjectDir: true,
             versioning: "branch",
             appInfrastructure: [
                 [file: "cloudformation/backend/app-infrastructure.yml"]
             ],
             s3Context: [
-                glob: "backend/**/*,types/**/*,*.json"
-            ],
-            fileFilter: [
-                include: ["types/.*","cloudformation/backend/app-infrastructure.yml"]
+                glob: "packages/backend/**/*,packages/types/**/*,packages/frontend/package.json,*.json,yarn.lock,.yarn*",
+                exclude: "**/node_modules,**/node_modules/**,**/*.log,.git"
             ],
             dockerConfig: [
-                dockerFile: "backend/cl.Dockerfile",
+                cpu: 2048,
+                memory: 8192,
+                dockerFile: "packages/backend/cl.Dockerfile",
                 requiresCodeArtifactToken: true,
             ],
             automatedBranchBuilds: [
@@ -45,30 +34,24 @@ projectBuilderV5 (
         ],
         "upgrade":[
             artifactType: 'codeartifact',
-            projectDir: 'frontend',
+            projectDir: '.',
             runInProjectDir: true,
-            artifactDir: 'dist/upgrade/browser',
+            artifactDir: 'packages/frontend/dist/upgrade/browser',
             artifactPrefix: "upgrade",
             versioning: 'branch',
             oneArtifactPerEnvironment: true,
-            dependencies: ["types"],
             buildScripts: [
                 [
-                    script: 'npm ci --no-audit',
-                    githubCheck: '${projectName} npm ci --no-audit',
-                    log: '${projectName}-npm-ci.log'
-                ],
-                [
-                    script: 'npm run test',
+                    script: 'npx yarn workspace upgrade-frontend test',
                     githubCheck: "upgrade-frontend-test",
                     log: "upgrade-frontend-test.log"
                 ],
                 [
-                    script: 'npm run prebuild:project',
+                    script: 'npx yarn workspace upgrade-frontend prebuild:project',
                     log: 'env-pre-build.log',
                 ],
                 [
-                    script: 'npm run build:project',
+                    script: 'npx yarn workspace upgrade-frontend build:project',
                     log: '${projectName}-build.log',
                     githubCheck: '${projectName}-build'
                 ]
@@ -87,53 +70,17 @@ projectBuilderV5 (
         "upgrade-backend-tests": [
             artifactType: "codeartifact",
             versioning: "none",
-            projectDir: "backend",
+            projectDir: ".",
             runInProjectDir: true,
             skipArtifactUpload: true,
-            dependencies: ["types"],
-            fileFilter: [
-                include: ["backend/packages/Upgrade/.*"]
-            ],
             buildScripts: [
                 [
-                    script: 'npm run install:upgrade',
-                    log: '${projectName}-npm-ci.log'
-                ],
-                [
-                    script: 'npm run test:upgrade',
+                    script: 'npx yarn workspace upgrade-backend test',
                     githubCheck: '${projectName} test',
                     log: '${projectName}-test.log'
                 ]
             ]
         ],
-         "scheduler-lambda": [
-            artifactType: "s3",
-            versioning: "calendar",
-            projectDir: "backend/packages/Scheduler",
-            artifactDir: "dist",
-            runInProjectDir: true,
-            s3Config: [
-                file: "scheduler-lambda.zip",
-                path: "scheduler-lambda/"
-            ],
-            buildScripts: [
-                [
-                    script: 'npm ci --no-audit',
-                    githubCheck: '${projectName} npm ci --no-audit',
-                    log: '${projectName}-npm-ci.log'
-                ],
-                [
-                    script: 'npm run build:prod',
-                    log: '${projectName}-build.log',
-                    githubCheck: '${projectName}-build'
-                ],
-                [
-                    script: 'npm run postbuild',
-                    log: '${projectName}-post-build.log'
-                ]
-
-            ]
-        ],
     ],
     deployments: [
         UpgradeService: [
@@ -174,31 +121,13 @@ projectBuilderV5 (
                 ]
             ]
         ],
-        "Scheduler-Lambda": [
-            projects: ["scheduler-lambda"],
-            automated: [
-                [
-                    type: "defaultBranch",
-                    environment: "qa"
-                ]
-            ],
-            jobs: [
-                [
-                    job: "Upgrade-Scheduler-Lambda-Deploy"
-                ]
-            ]
-        ],
     ],
     prChecks: [
         "checks": [
            "lint": [
              buildScripts: [
                [
-                 script: 'npm ci --no-audit',
-                 log: 'npm-ci.log'
-               ],
-               [
-                 script: 'npm run lint',
+                 script: 'npx yarn lint',
                  githubCheck: 'lint',
                  log: 'lint.log'
                ]