chore(dogfooding devfiles): refresh dogfooding devfiles with the righ…

…t memory usage, typescript plugin id, skip lint, format and test (#1178) * chore(dogfooding devfiles): refresh dogfooding devfiles with the right memory usage, typescript plugin id, skip lint and test option. * Runs the required GH Workflow for any changes.
eclipse-che · Jul 29, 2021 · 6fe4d56 · tsadigovAgmail · May 17, 2022 · 6fe4d56
1 parent cfc26e5
commit 6fe4d56
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 39 deletions.
diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
@@ -12,13 +12,7 @@
 name: CI
 
 # Trigger the workflow on pull request
-on:
-  pull_request:
-    paths-ignore:
-      - '**/*.md'
-      - devfile.yaml
-      - 'devfiles/*'
-      - 'tools/*'
+on: [pull_request]
 
 jobs:
   node-build:

diff --git a/devfiles/che-theia-all.devfile.yaml → devfiles/che-theia-dev.devfile.yaml b/devfiles/che-theia-all.devfile.yaml → devfiles/che-theia-dev.devfile.yaml
@@ -3,7 +3,7 @@
 
 apiVersion: 1.0.0
 metadata:
-  name: che-theia-all
+  generateName: che-theia-dev-
 
 projects:
 
@@ -29,12 +29,12 @@ components:
         attributes:
           protocol: http
           public: 'true'
-    memoryLimit: "3Gi"
+    memoryLimit: "4Gi"
 
   - id: redhat/vscode-yaml/latest
     type: chePlugin
 
-  - id: che-incubator/typescript/latest
+  - id: vscode/typescript-language-features/latest
     type: chePlugin
     memoryLimit: 2048M
 
@@ -47,12 +47,20 @@ components:
         value: "0"
 commands:
 
+  - name: set theia to the pinned revision
+    actions:
+      - workdir: /projects/theia
+        type: exec
+        command: |
+          bash -c 'source /projects/che-theia/build.include && echo "Setting theia to revision ${THEIA_COMMIT_SHA}" && git reset --hard "${THEIA_COMMIT_SHA}"'
+        component: che-dev
+
   - name: init ... DEV che-theia
     actions:
       - type: exec
         component: che-dev
         command: >
-                 che-theia init && echo -e
+                 che-theia init --alias https://github.com/eclipse-che/che-theia=/projects/che-theia && echo -e
                  "\e[32mDone.\e[0m che-theia init"
         workdir: /projects/theia
 
@@ -70,7 +78,9 @@ commands:
       - type: exec
         component: che-dev
         command: >
-                 killall node;
+                 export SKIP_LINT=true &&
+                 export SKIP_TEST=true &&
+                 export SKIP_FORMAT=true &&
                  yarn &&
                  che-theia production &&
                  echo -e "\e[32mDone.\e[0m build ... che-theia"
@@ -81,7 +91,6 @@ commands:
       - type: exec
         component: che-dev
         command: >
-                 killall node;
                  yarn &&
                  echo -e "\e[32mDone.\e[0m build ... containers-plugin"
         workdir: /projects/che-theia/plugins/containers-plugin
@@ -91,7 +100,6 @@ commands:
       - type: exec
         component: che-dev
         command: >
-                 killall node;
                  yarn &&
                  echo -e "\e[32mDone.\e[0m build ... workspace-plugin"
         workdir: /projects/che-theia/plugins/workspace-plugin
@@ -101,7 +109,6 @@ commands:
       - type: exec
         component: che-dev
         command: >
-                 killall node;
                  yarn test-watch
         workdir: /projects/che-theia/plugins/workspace-plugin
 
@@ -110,59 +117,54 @@ commands:
       - type: exec
         component: theia-editor
         command: >
-                 kill `cat /tmp/node_theiadev.pid`;
                  rm /default-theia-plugins/eclipse_che_workspace_plugin.theia;
                  mkdir -p /tmp/theiadev_projects &&
                  export CHE_PROJECTS_ROOT=/tmp/theiadev_projects &&
                  export HOSTED_PLUGIN=/projects/che-theia/plugins/workspace-plugin/ &&
-                 node src-gen/backend/main.js /tmp/theiadev_projects --hostname=0.0.0.0 --port=3130 & echo $!> /tmp/node_theiadev.pid ; wait `cat /tmp/node_theiadev.pid`
+                 node src-gen/backend/main.js /tmp/theiadev_projects --hostname=0.0.0.0 --port=3130
         workdir: /projects/theia/production
 
   - name: run ... DEV che-theia + container-plugin
     actions:
       - type: exec
         component: theia-editor
         command: >
-                 kill `cat /tmp/node_theiadev.pid`;
                  rm /default-theia-plugins/eclipse_che_theia_containers_plugin.theia;
                  mkdir -p /tmp/theiadev_projects &&
                  export CHE_PROJECTS_ROOT=/tmp/theiadev_projects &&
                  export HOSTED_PLUGIN=/projects/che-theia/plugins/containers-plugin/ &&
-                 node src-gen/backend/main.js /tmp/theiadev_projects --hostname=0.0.0.0 --port=3130 & echo $!> /tmp/node_theiadev.pid ; wait `cat /tmp/node_theiadev.pid`
+                 node src-gen/backend/main.js /tmp/theiadev_projects --hostname=0.0.0.0 --port=3130
         workdir: /projects/theia/production
 
   - name: run ... HOSTED che-theia + workspace-plugin
     actions:
       - type: exec
         component: theia-editor
         command: >
-                 kill `cat /tmp/node_theiadev.pid`;
                  rm /default-theia-plugins/eclipse_che_workspace_plugin.theia;
                  mkdir -p /tmp/theiadev_projects &&
                  export CHE_PROJECTS_ROOT=/tmp/theiadev_projects &&
                  cp /projects/che-theia/plugins/workspace-plugin/eclipse_che_workspace_plugin.theia /default-theia-plugins/ &&
-                 node src-gen/backend/main.js /tmp/theiadev_projects --hostname=0.0.0.0 --port=3130 & echo $!> /tmp/node_theiadev.pid ; wait `cat /tmp/node_theiadev.pid`
+                 node src-gen/backend/main.js /tmp/theiadev_projects --hostname=0.0.0.0 --port=3130
         workdir: /home/theia
 
   - name: run ... HOSTED che-theia + container-plugin
     actions:
       - type: exec
         component: theia-editor
         command: >
-                 kill `cat /tmp/node_theiadev.pid`;
                  rm /default-theia-plugins/eclipse_che_theia_containers_plugin.theia;
                  mkdir -p /tmp/theiadev_projects &&
                  export CHE_PROJECTS_ROOT=/tmp/theiadev_projects &&
                  cp /projects/che-theia/plugins/containers-plugin/eclipse_che_theia_containers_plugin.theia /default-theia-plugins/ &&
-                 node src-gen/backend/main.js /tmp/theiadev_projects --hostname=0.0.0.0 --port=3130 & echo $!> /tmp/node_theiadev.pid ; wait `cat /tmp/node_theiadev.pid`
+                 node src-gen/backend/main.js /tmp/theiadev_projects --hostname=0.0.0.0 --port=3130
         workdir: /home/theia
 
   - name: run ... DEV yarn start ... che-theia + workspace-plugin
     actions:
       - type: exec
         component: che-dev
         command: >
-                 killall node;
                  mkdir -p /tmp/theiadev_projects &&
                  export CHE_PROJECTS_ROOT=/tmp/theiadev_projects &&
                  export HOSTED_PLUGIN=/projects/che-theia/plugins/workspace-plugin/ &&
@@ -175,7 +177,6 @@ commands:
       - type: exec
         component: che-dev
         command: >
-                 killall node;
                  mkdir -p /tmp/theiadev_projects &&
                  export CHE_PROJECTS_ROOT=/tmp/theiadev_projects &&
                  export HOSTED_PLUGIN=/projects/che-theia/plugins/containers-plugin/ &&

diff --git a/devfiles/hosted-che-dogfooding.devfile.yaml → ...les/che-theia-dev.devsandbox.devfile.yaml b/devfiles/hosted-che-dogfooding.devfile.yaml → ...les/che-theia-dev.devsandbox.devfile.yaml
@@ -14,7 +14,7 @@
 apiVersion: 1.0.0
 
 metadata:
-  name: theia-dogfooding
+  generateName: che-theia-dev-devsandbox-
 
 projects:
   - name: theia
@@ -31,23 +31,19 @@ projects:
 
 components:
   - id: eclipse/che-theia/latest
-    memoryLimit: 1500M
     type: cheEditor
     alias: theia-editor
     env:
       - name: NODE_TLS_REJECT_UNAUTHORIZED
         value: "0"
 
   - type: chePlugin
-    id: che-incubator/typescript/latest
-    memoryLimit: 2048M
+    id: vscode/typescript-language-features/latest
+    memoryLimit: 768M
 
   - type: chePlugin
     id: redhat/vscode-yaml/latest
 
-  - type: chePlugin
-    id: eclipse/che-machine-exec-plugin/latest
-
   - type: dockerimage
     image: 'quay.io/eclipse/che-theia-dev:next'
     alias: che-dev
@@ -58,13 +54,22 @@ components:
         attributes:
           protocol: http
           public: 'true'
-    memoryLimit: 3Gi
+    memoryLimit: 4Gi
     env:
       - name: BUILD_PATH
         value: /tmp
 
 commands:
-  - name: '1. Init che-theia'
+
+  - name: '1. Set theia to the pinned revision'
+    actions:
+      - workdir: /projects/theia
+        type: exec
+        command: |
+          bash -c 'source /projects/che-theia/build.include && echo "Setting theia to revision ${THEIA_COMMIT_SHA}" && git reset --hard "${THEIA_COMMIT_SHA}"'
+        component: che-dev
+
+  - name: '2. Init che-theia'
     actions:
       - workdir: /projects
         type: exec
@@ -82,7 +87,7 @@ commands:
           fi
         component: che-dev
 
-  - name: '2. Rsync sources'
+  - name: '3. Rsync sources'
     actions:
       - workdir: /projects
         type: exec
@@ -98,11 +103,14 @@ commands:
           fi
         component: che-dev
 
-  - name: '3. Build che-theia'
+  - name: '4. Build che-theia'
     actions:
       - workdir: /projects
         type: exec
         command: |
+          export SKIP_LINT=true; \
+          export SKIP_TEST=true; \
+          export SKIP_FORMAT=true; \
           if [ -d "$BUILD_PATH/theia/examples/assembly" ]; then \
             echo -e '\e[32mBuilding che-theia...\e[0m'; \
             cd $BUILD_PATH/theia; \
@@ -114,7 +122,7 @@ commands:
           fi
         component: che-dev
 
-  - name: '4.1. Prepare theia-* dirs'
+  - name: '5.1. Prepare theia-* dirs'
     actions:
       - workdir: /projects
         type: exec
@@ -127,7 +135,7 @@ commands:
           echo -e '\e[32mDone\e[0m'
         component: theia-editor
 
-  - name: '4.2. Launch'
+  - name: '5.2. Launch'
     actions:
       - workdir: /projects
         type: exec

diff --git a/devfiles/vscode-extensions.devfile.yaml b/devfiles/vscode-extensions.devfile.yaml
@@ -36,7 +36,7 @@ components:
   - id: redhat/vscode-yaml/latest
     type: chePlugin
 
-  - id: che-incubator/typescript/latest
+  - id: vscode/typescript-language-features/latest
     type: chePlugin
     memoryLimit: 2048M