tune test for CI

inverse-inc · Jun 9, 2023 · dffefaf · dffefaf
1 parent 9726bda
commit dffefaf
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git a/t/html/pfappserver/cypress/config/cypress.config-configurator.js b/t/html/pfappserver/cypress/config/cypress.config-configurator.js
@@ -9,6 +9,5 @@ module.exports = {
     specPattern: [
       'cypress/specs/e2e/*-configurator/**/*.cy.{js,jsx,ts,tsx}',
     ],
-    experimentalSessionAndOrigin: false,
   }
 };
diff --git a/t/html/pfappserver/cypress/config/cypress.config.js b/t/html/pfappserver/cypress/config/cypress.config.js
@@ -32,7 +32,6 @@ module.exports = {
     specPattern: [
       'cypress/specs/e2e/*.cy.{js,jsx,ts,tsx}',
     ],
-    experimentalSessionAndOrigin: true,
     testIsolation: true,
   },
   downloadsFolder: 'cypress/results/downloads',

diff --git a/t/html/pfappserver/cypress/specs/e2e/00-configurator/01-configurator.cy.js b/t/html/pfappserver/cypress/specs/e2e/00-configurator/01-configurator.cy.js
@@ -3,7 +3,7 @@
 // API async w/ pfqueue polling,
 // instead of poll tracking request chains, just wait a while and intercept final request
 // TODO: improve intercepts w/ pfqueue polling
-let waitForPfqueuePolling = { timeout: 90E3 } // 90 seconds
+let waitForPfqueuePolling = { timeout: 300E3 } // 5 minutes (90 seconds is too short)
 
 describe('Configurator', () => {
 

diff --git a/t/venom/scenarios/pfappserver/playbooks/configure.yml b/t/venom/scenarios/pfappserver/playbooks/configure.yml
@@ -13,6 +13,13 @@
       tags: nodejs
 
   tasks:
+    - name: Synchronize t/html/pfappserver
+      ansible.posix.synchronize:
+        src: "{{ lookup('env', 'VENOM_ROOT_DIR') }}/../html/pfappserver"
+        dest: '/usr/local/pf/t/html/'
+        archive: yes
+        delete: yes
+
     - name: Install Cypress dependencies on debian
       community.general.make:
         chdir: /usr/local/pf/t/html/pfappserver

diff --git a/t/venom/scenarios/pfappserver/playbooks/localdev.yml b/t/venom/scenarios/pfappserver/playbooks/localdev.yml
@@ -1,6 +1,6 @@
 ---
 - hosts: pfservers
-  name: Setup localdev
+  name: Use local development sources
   become: True
 
   vars:
@@ -30,20 +30,13 @@
         source: local
       loop: "{{ docker_images }}"
 
-    - name: Create localdev .local_env, mounts /usr/local/pf/html/pfappserver/root
+    - name: Create containers/.local_env, mounts /usr/local/pf/html/pfappserver/root
       copy:
         dest: "/usr/local/pf/containers/.local_env"
         content: |
           LOCAL_DEV=true
           HTML_PFAPPSERVER_ROOT_MOUNT=/usr/local/pf/html/pfappserver/root
 
-    - name: Synchronize t/html/pfappserver
-      ansible.posix.synchronize:
-        src: "{{ lookup('env', 'VENOM_ROOT_DIR') }}/../html/pfappserver"
-        dest: '/usr/local/pf/t/html/'
-        archive: yes
-        delete: yes
-
     - name: Synchronize html/pfappserver/root/dist
       ansible.posix.synchronize:
         src: "{{ lookup('env', 'VENOM_ROOT_DIR') }}/../../html/pfappserver/root/dist"
@@ -58,7 +51,7 @@
         archive: yes
         delete: yes
 
-    - name: restart packetfence-httpd.admin_dispatcher
+    - name: Restart packetfence-httpd.admin_dispatcher (rebuild w/ containers/.local_env)
       ansible.builtin.service:
         name: packetfence-httpd.admin_dispatcher
         state: restarted