Merge pull request #88 from pondersource/enhance-ocm-test-suite

Enhance OCM Test Suite

.github/workflows/basic.yml

@@ -1,4 +1,4 @@
-name: Basic workflow for testing GitHub Actions and act.
+name: Basic workflow.
 
 on:
   workflow_dispatch

.github/workflows/ocm-test-suite.yml

@@ -1,5 +1,4 @@
-name: ocm-test-suite
-run-name: Open Cloud Mesh Test Suite
+name: Open Cloud Mesh Test Suite
 
 # Controls when the action will run. 
 on:
@@ -33,19 +32,19 @@ jobs:
 
       - name: Pull images
         shell: bash
-        run: ./ci/ocm-test-suite-pull-images.sh
+        run: ./docker/pull/ocm-test-suite.sh
 
-      - name: Initalize OCM tests dependencies
+      - name: Initialize OCM tests dependencies
         shell: bash
-        run: ./ci/ocm-test-suite-init-deps.sh
+        run: ./init/ocm-test-suite.sh ci
 
       - name: Run tests
         shell: bash
-        run: ./ci/ocm-test-suite.sh ${{ matrix.browser }}
+        run: ./dev/ocm-test-suite.sh ci ${{ matrix.browser }}
 
       - name: Upload Cypress video artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ matrix.record }}
         with:
           name: cypress-videos
-          path: ./cypress/ocm-tests/cypress/videos
+          path: ./cypress/ocm-test-suite/cypress/videos

.gitignore

@@ -2,6 +2,7 @@
 .idea/
 .DS_Store
 
+bin/
 ocm
 reva/
 core
@@ -24,4 +25,4 @@ surf-trashbin-app
 oc-sciencemesh-release
 nc-sciencemesh-release
 surf-token-based-access
-cypress/ocm-tests/cypress/videos/*
+cypress/ocm-test-suite/cypress/videos/*

.gitlab-ci.yml

@@ -15,12 +15,12 @@ ocm-test-suite:
   script:
     - apk add bash
     - apk add git
-    - ./ci/ocm-test-suite-pull-images.sh
-    - ./ci/ocm-test-suite-init-deps.sh
-    - ./ci/ocm-test-suite.sh $BROWSER
+    - ./docker/pull/ocm-test-suite.sh
+    - ./init/ocm-test-suite.sh ci
+    - ./dev/ocm-test-suite.sh ci $BROWSER
   artifacts:
     paths:
-      - ./cypress/ocm-tests/cypress/videos
+      - ./cypress/ocm-test-suite/cypress/videos
     expire_in: 1 week
   rules:
   - if: '$CI_COMMIT_BRANCH == "main"'

.gitpod.Dockerfile

@@ -2,8 +2,12 @@ FROM gitpod/workspace-full:latest
 
 RUN sudo install-packages php-xdebug
 
+# install act.
+RUN mkdir -p /dev-stock/bin/act
+RUN wget -qO- https://github.com/nektos/act/releases/download/$(curl -I https://github.com/nektos/act/releases/latest | awk -F '/' '/^location/ {print  substr($NF, 1, length($NF)-1)}')/act_Linux_x86_64.tar.gz | tar xvz -C /dev-stock/bin/act
+
 # add binary directory to path.
-ENV PATH="/workspace/dev-stock/bin:${PATH}"
+ENV PATH="/dev-stock/bin:${PATH}"
 
 # initialize act rc with medium images.
 RUN echo "-P ubuntu-latest=catthehacker/ubuntu:act-latest" >> /home/gitpod/.actrc

.gitpod.yml

@@ -41,4 +41,4 @@ ports:
     description: Xdebug client port.
 
 tasks:
-  - init: chmod +x ./init/gitpod-prebuild.sh && ./init/gitpod-prebuild.sh
+  - init: chmod +x ./init/prebuild.sh && ./init/prebuild.sh

README.md

@@ -1,5 +1,5 @@
 # dev-stock
-[![ocm-test-suite](https://github.com/pondersource/dev-stock/actions/workflows/ocm-test-suite.yml/badge.svg)](https://github.com/pondersource/dev-stock/actions/workflows/ocm-test-suite.yml)
+[![Open Cloud Mesh Test Suite](https://github.com/pondersource/dev-stock/actions/workflows/ocm-test-suite.yml/badge.svg)](https://github.com/pondersource/dev-stock/actions/workflows/ocm-test-suite.yml)
 
 Docker images we use in development.