Run integration tests on KinD

- Introduce another environment variable in the tests,
  `IS_OPENSHIFT`, which indicates if the cluster is OpenShift or another k8s
- Set `IS_OPENSHIFT` to true when running on Jenkins
- Rewrite the tests to skip tests of OpenShift-specific features when
  the cluster isn't OpenShift
- Modify the CI GitHub Action to run the integration tests on KinD on
  Linux
- Report combined coverage of the unit and integration test

*minor annoyance:*

When deleting a namespace in the teardown step of tests,
the command wouldn't return when running on a non-OpenShift
Kubernetes cluster.
(Note that it works fine when running the command on CLI).
In order to prevent this from causing timeout errors,
I don't `await` these calls.

Closes #2871

Signed-off-by: David Thompson <[email protected]>

Author: datho7561

.github/workflows/continuous-integration-workflow.yml

@@ -44,13 +44,6 @@ jobs:
         with:
           run: npm run test:coverage --silent
 
-      # Upload coverage to codecov.io
-      - name: Codecov
-        uses: codecov/codecov-action@40a12dcee2df644d47232dde008099a3e9e4f865 #v3.1.2
-        if: runner.os == 'Linux'
-        with:
-          file: ./out/coverage/coverage-final.json
-
       # UI tests fail under linux
       # Run UI tests
       - name: Run UI Tests
@@ -62,6 +55,36 @@ jobs:
           run: npm run public-ui-test
           options: -screen 0 1920x1080x24
 
+      - uses: engineerd/setup-kind@aa272fe2a7309878ffc2a81c56cfe3ef108ae7d0 #v0.5.0
+        if: (success() || failure()) && runner.os == 'Linux'
+        name: Start cluster
+        with:
+          version: v0.11.1
+
+      - name: Configure cluster
+        if: (success() || failure()) && runner.os == 'Linux'
+        run: |
+          curl -sL https://github.com/operator-framework/operator-lifecycle-manager/releases/download/v0.19.1/install.sh | bash -s v0.19.1
+          kubectl create -f https://operatorhub.io/install/service-binding-operator.yaml
+          kubectl create -f https://operatorhub.io/install/stable/cloud-native-postgresql.yaml
+          nb=0
+          echo -n "Waiting for operator to show up "
+          while [ "$nb" != "2" ]
+          do
+            echo -n "."
+            sleep 1
+            nb=`kubectl get pods -n operators --no-headers --ignore-not-found | grep Running | wc -l`
+          done
+          echo CLUSTER_URL=`kubectl cluster-info | sed -n -e "s/\x1B\[[0-9;]*[a-zA-Z]//g" -e '1s/.*running at \(.*\)$/\1/p'` >> $GITHUB_ENV
+
+      - name: Build and run integration tests
+        if: (success() || failure()) && runner.os == 'Linux'
+        uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3 #v1.0.1
+        env:
+          NODE_OPTIONS: --max_old_space_size=16384
+        with:
+          run: npm run test-integration:coverage --silent
+
       # Archiving integration tests artifacts
       - name: Upload test artifacts
         uses: actions/upload-artifact@v3
@@ -72,3 +95,9 @@ jobs:
             test-resources/screenshots/*.png
           retention-days: 2
 
+      # Upload coverage to codecov.io
+      - name: Codecov
+        uses: codecov/codecov-action@40a12dcee2df644d47232dde008099a3e9e4f865 #v3.1.2
+        if: (success() || failure()) && runner.os == 'Linux'
+        with:
+          files: ./coverage/unit/coverage-final.json,./coverage/integration/coverage-final.json

coverconfig.json

@@ -1,7 +1,7 @@
 {
     "enabled": true,
     "relativeSourcePath": "../../src",
-    "relativeCoverageDir": "../../coverage",
+    "relativeCoverageDir": "../../../coverage",
     "ignorePatterns": [
         "**/node_modules/**"
     ],

package-lock.json

@@ -57,7 +57,7 @@
 		"compile:checkWebviews": "tsc -p ./src/webview -noEmit",
 		"compile:webviews": "node ./build/esbuild.mjs",
 		"watch": "node ./build/esbuild-watch.mjs",
-		"clean": "shx rm -rf out/build out/coverage out/src out/test out/tools out/test-resources out/*Viewer out/**.tsbuildinfo",
+		"clean": "shx rm -rf out/build out/src out/test out/tools out/test-resources out/*Viewer out/**.tsbuildinfo",
 		"lint": "eslint . --ext .ts --quiet",
 		"lint-fix": "eslint . --ext .ts --fix",
 		"lint-nic": "eslint . --ext .ts --no-inline-config",
@@ -69,7 +69,6 @@
 		"test:instrument": "shx rm -rf out/src-orig && shx mv out/src out/src-orig && istanbul instrument --complete-copy --embed-source --output out/src out/src-orig",
 		"test:coverage": "npm run build && npm run test:instrument && node ./out/build/install-vscode.js && node ./out/build/run-tests.js unit",
 		"update-deps": "ncu --upgrade --loglevel verbose --packageFile package.json && npm update",
-		"coverage:upload": "codecov -f coverage/coverage-final.json",
 		"build": "npm run clean && npm run lint && npm run compile && npm run bundle-tools",
 		"cluster-ui-test": "extest setup-and-run out/test/ui/cluster-ui-test.js -o test/ui/settings.json -m test/ui/.mocharc.js -e ./test-resources/extensions -c max -i",
 		"public-ui-test": "extest setup-and-run out/test/ui/public-ui-test.js -o test/ui/settings.json -m test/ui/.mocharc.js -e ./test-resources/extensions -c max -i"

package.json

@@ -89,7 +89,7 @@ export class CliChannel implements Cli {
         this.odoChannel.show();
     }
 
-    async execute(cmd: string, opts: cp.ExecOptions = {}): Promise<CliExitData> {
+    execute(cmd: string, opts: cp.ExecOptions = {}): Promise<CliExitData> {
         return new Promise<CliExitData>((resolve) => {
             if (opts.maxBuffer === undefined) {
                 opts.maxBuffer = 2 * 1024 * 1024;
@@ -139,7 +139,7 @@ export class CliChannel implements Cli {
         return optsCopy;
     }
 
-    async executeTool(command: CommandText, opts?: cp.ExecOptions, fail = false): Promise<CliExitData> {
+    async executeTool(command: CommandText, opts?: cp.ExecOptions, fail = true): Promise<CliExitData> {
         const commandActual = command.toString();
         const commandPrivacy = command.privacyMode(true).toString();
         const [cmd] = commandActual.split(' ');

src/cli.ts

@@ -238,7 +238,7 @@ export class OpenShiftExplorer implements TreeDataProvider<ExplorerItem>, Dispos
             result = [...await this.odo3.getDeploymentConfigs(), ...await this.odo3.getDeployments(), ...await Helm.getHelmReleases()];
         }
         // don't show Open In Developer Dashboard if not openshift cluster
-        const openshiftResources = await CliChannel.getInstance().executeTool(Command.isOpenshiftCluster());
+        const openshiftResources = await CliChannel.getInstance().executeTool(Command.isOpenshiftCluster(), undefined, false);
         let isOpenshiftCluster = true;
         if (openshiftResources.stdout.length === 0){
             isOpenshiftCluster = false;

src/explorer.ts

@@ -260,6 +260,9 @@ export class Command {
         return new CommandText('oc whoami -t');
     }
 
+    /**
+     * Only works for OpenShift clusters
+     */
     static showConsoleUrl(): CommandText {
         return new CommandText('oc get configmaps console-public -n openshift-config-managed -o json');
     }

src/odo/command.ts

@@ -10,16 +10,16 @@ import { CliChannel } from '../cli';
 import { OpenShiftExplorer } from '../explorer';
 import { getInstance as getOdoInstance } from '../odo';
 import { Progress } from '../util/progress';
-import { VsCommandError, vsCommand } from '../vscommand';
+import { vsCommand, VsCommandError } from '../vscommand';
 import OpenShiftItem from './openshiftItem';
 
 export class Command {
     static setActiveProject(name: string) {
-        return new CommandText('oc', `project ${name}`);
+        return new CommandText('odo', `set namespace ${name}`);
     }
 
     static deleteProject(name: string) {
-        return new CommandText('oc delete project', name, [new CommandOption('--wait=true')])
+        return new CommandText('odo delete namespace', name, [new CommandOption('--wait=true'), new CommandOption('-f')])
     }
 
     static getAll(namespace: string) {

src/openshift/project.ts

@@ -9,16 +9,10 @@
 
 import paths = require('path');
 import fs = require('fs');
-
+import * as mkdirp from 'mkdirp';
 const istanbul = require('istanbul');
 const remapIstanbul = require('remap-istanbul');
 
-function _mkDirIfExists(dir: string): void {
-    if (!fs.existsSync(dir)) {
-        fs.mkdirSync(dir);
-    }
-}
-
 export interface TestRunnerOptions {
     relativeCoverageDir?: string;
     relativeSourcePath?: string;
@@ -43,7 +37,7 @@ export class CoverageRunner {
      *
      * @memberOf CoverageRunner
      */
-    public reportCoverage(): void {
+    public async reportCoverage(): Promise<void> {
         // istanbul.hook.unhookRequire();
 
         if (typeof global[this.coverageVar] === 'undefined' || Object.keys(global[this.coverageVar]).length === 0) {
@@ -58,8 +52,7 @@ export class CoverageRunner {
         const coverageFile = paths.resolve(reportingDir, `coverage${pidExt}.json`);
 
         // yes, do this again since some test runners could clean the dir initially created
-        _mkDirIfExists(reportingDir);
-
+        await mkdirp(reportingDir);
         fs.writeFileSync(coverageFile, JSON.stringify(cov), 'utf8');
 
         const remappedCollector = remapIstanbul.remap(cov, {
@@ -74,5 +67,6 @@ export class CoverageRunner {
         reporter.write(remappedCollector, true, () => {
             console.log(`Reports written to ${reportingDir}`);
         });
+
     }
 }