ci adjustments (#1120)

Co-authored-by: Victor Carvajal <[email protected]>

Author: Guy Bedford

.github/workflows/main.yml

@@ -384,7 +384,7 @@ jobs:
         FASTLY_API_TOKEN: ${{ secrets.FASTLY_API_TOKEN }}
 
     - name: Run Module Mode Tests
-      run: SUFFIX_STRING=${{matrix.profile}} node integration-tests/js-compute/test.js --ci --skip-setup --module-mode${{ matrix.platform == 'viceroy' && ' --local' || '' }}${{ matrix.profile == 'weval' && ' --aot' || '' }}${{ matrix.features == 'http-cache' && ' --http-cache' || '' }}
+      run: SUFFIX_STRING=${{matrix.profile}} node integration-tests/js-compute/test.js --ci --module-mode${{ matrix.platform == 'viceroy' && ' --local' || '' }}${{ matrix.profile == 'weval' && ' --aot' || '' }}${{ matrix.features == 'http-cache' && ' --http-cache' || '' }}
       env:
         FASTLY_API_TOKEN: ${{ secrets.FASTLY_API_TOKEN }}  
 
@@ -451,6 +451,6 @@ jobs:
         FASTLY_API_TOKEN: ${{ secrets.FASTLY_API_TOKEN }}
 
     - name: Run Module Mode Tests
-      run: SUFFIX_STRING=debug node integration-tests/js-compute/test.js --ci --skip-setup --module-mode --debug-build${{ matrix.platform == 'viceroy' && ' --local' || '' }}${{ matrix.features == 'http-cache' && ' --http-cache' || '' }}
+      run: SUFFIX_STRING=debug node integration-tests/js-compute/test.js --ci --module-mode --debug-build${{ matrix.platform == 'viceroy' && ' --local' || '' }}${{ matrix.features == 'http-cache' && ' --http-cache' || '' }}
       env:
         FASTLY_API_TOKEN: ${{ secrets.FASTLY_API_TOKEN }}  

integration-tests/js-compute/fixtures/module-mode/src/kv-store.js

@@ -1392,7 +1392,9 @@ const debug = sdkVersion.endsWith('-debug');
   routes.set('/kv-store-options/gen', async () => {
     let store = new KVStore(KV_STORE_NAME);
     let key = `entry-options`;
-    await store.put(key, 'body op', { gen: 2 });
+    await store.put(key, 'body op', {
+      gen: 2,
+    });
     let entry = await store.get(key);
     let result = entry.body;
     strictEqual(

integration-tests/js-compute/fixtures/module-mode/tests.json

@@ -402,7 +402,10 @@
   "GET /kv-store-entry/json/valid": { "flake": true },
   "GET /kv-store-entry/json/invalid": { "flake": true },
   "GET /kv-store-entry/arrayBuffer/valid": { "flake": true },
-  "GET /kv-store-options/gen": { "flake": true },
+  "GET /kv-store-options/gen": {
+    "skip": true,
+    "flake": true
+  },
   "GET /kv-store-options/gen-invalid": { "flake": true },
   "GET /kv-store-entry/body": { "flake": true },
   "GET /kv-store-entry/bodyUsed": { "flake": true },

integration-tests/js-compute/setup.js

@@ -113,16 +113,11 @@ async function setupKVStore() {
 async function setupSecretStore() {
   let stores = await (async function () {
     try {
-      res = JSON.parse(
+      return JSON.parse(
         await zx`fastly secret-store list --quiet --json --token $FASTLY_API_TOKEN`,
       );
-      if (res == null) {
-        return [];
-      } else {
-        return res;
-      }
-    } catch {
-      return [];
+    } catch (e) {
+      throw e;
     }
   })();
   const STORE_ID = existingStoreId(stores, SECRET_STORE_NAME);

integration-tests/js-compute/test.js

@@ -45,6 +45,8 @@ const httpCache = args.includes('--http-cache');
 const aot = args.includes('--aot');
 const debugBuild = args.includes('--debug-build');
 const debugLog = args.includes('--debug-log');
+const skipSetup = args.includes('--skip-setup');
+const skipTeardown = args.includes('--skip-teardown');
 const filter = args.filter((arg) => !arg.startsWith('--'));
 const bail = args.includes('--bail');
 const ci = args.includes('--ci');
@@ -185,7 +187,7 @@ const [{ default: tests }] = await Promise.all([
     );
   })(),
   (async () => {
-    if (!local) {
+    if (!local && !skipSetup) {
       const setupPath = join(__dirname, 'setup.js');
       if (existsSync(setupPath)) {
         await zx`node ${setupPath} ${serviceId} ${ci ? serviceName : ''}`;
@@ -428,13 +430,10 @@ if (failed.length) {
 }
 
 if (!local && failed.length) {
-  core.notice(`Tests failed, the service is named "${serviceName}"`);
-  if (domain) {
-    core.notice(`You can debug the service on ${domain}`);
-  }
+  core.notice(`Tests failed.`);
 }
 
-if (!local && !failed.length) {
+if ((!local && !skipTeardown) || failed.length > 0) {
   const teardownPath = join(fixturePath, 'teardown.js');
   if (existsSync(teardownPath)) {
     core.startGroup('Tear down the extra set-up for the service');