test(e2e): more squashing

Signed-off-by: Daniel Villanueva <[email protected]>
crc-org · Jan 15, 2025 · b02f435 · b02f435
1 parent 8f8300b
commit b02f435
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 26 deletions.
diff --git a/.github/workflows/e2e-main.yml b/.github/workflows/e2e-main.yml
@@ -71,12 +71,13 @@ jobs:
           ref: main
           path: sso-extension
 
-      - uses: actions/setup-node@v4
+      - name: Install node
+        uses: actions/setup-node@v4
         with:
           node-version: 20
 
-      - uses: pnpm/action-setup@v4
-        name: Install pnpm
+      - name: Install pnpm 
+        uses: pnpm/action-setup@v4
         with:
           run_install: false
           package_json_file: ./podman-desktop/package.json
@@ -116,24 +117,17 @@ jobs:
           Move-Item -Path package.json_tmp -Destination package.json -Force
         shell: pwsh
 
-#      - name: Install CRC extension dependencies 
-#        working-directory: ./crc-extension
-#        run: yarn install --check-files
-
-      - name: Execute yarn in OpenShift Local Extension
-        working-directory: ./crc-extension
-        run: yarn --frozen-lockfile
-
       - name: Revert unprivileged user namespace restrictions in Ubuntu 24.04
         if: matrix.os == 'ubuntu-24.04'
         run: |
           # allow unprivileged user namespace
           sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
 
-      - name: Build OpenShift Local extension from container file and SSO dependency (Ubuntu, podman)
+      - name: Install & build OpenShift Local extension from container file and SSO dependency (Ubuntu, podman)
         if: matrix.os == 'ubuntu-24.04'
         working-directory: ./crc-extension
         run: |
+          yarn install --check-files
           # build crc extension
           podman build -t openshift_local_image . -f ./oci/Containerfile.multistage
           CONTAINER_ID_CRC=$(podman create localhost/openshift_local_image --entrypoint "")

diff --git a/.github/workflows/pr-check.yaml b/.github/workflows/pr-check.yaml
@@ -150,12 +150,13 @@ jobs:
           ref: main
           path: sso-extension
 
-      - uses: actions/setup-node@v4
+      - name: Install node
+        uses: actions/setup-node@v4
         with:
           node-version: 20
 
-      - uses: pnpm/action-setup@v4
-        name: Install pnpm
+      - name: Install pnpm 
+        uses: pnpm/action-setup@v4
         with:
           run_install: false
           package_json_file: ./podman-desktop/package.json
@@ -195,26 +196,17 @@ jobs:
           Move-Item -Path package.json_tmp -Destination package.json -Force
         shell: pwsh
 
-#      - name: Install CRC extension dependencies 
-#        working-directory: ./crc-extension
-#        run: 
-
-      - name: Execute yarn in OpenShift Local Extension
-        working-directory: ./crc-extension
-        run: |
-          yarn install --check-files
-          # yarn --frozen-lockfile
-
       - name: Revert unprivileged user namespace restrictions in Ubuntu 24.04
         if: matrix.os == 'ubuntu-24.04'
         run: |
           # allow unprivileged user namespace
           sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
 
-      - name: Build OpenShift Local extension from container file and SSO dependency (Ubuntu, podman)
+      - name: Install & build OpenShift Local extension from container file and SSO dependency (Ubuntu, podman)
         if: matrix.os == 'ubuntu-24.04'
         working-directory: ./crc-extension
         run: |
+          yarn install --check-files
           # build crc extension
           podman build -t openshift_local_image . -f ./oci/Containerfile.multistage
           CONTAINER_ID_CRC=$(podman create localhost/openshift_local_image --entrypoint "")