Merge pull request #1186 from snyk/test/os4

test: fix openshift4 flakes

Author: ivanstanev

.circleci/config.yml

@@ -392,7 +392,7 @@ jobs:
     openshift4_integration_tests:
         machine:
             docker_layer_caching: true
-            image: ubuntu-2004:202111-02
+            image: ubuntu-2204:current
             resource_class: large
         steps:
             - checkout

.circleci/config/jobs/openshift4_integration_tests.yml

@@ -1,6 +1,7 @@
 machine:
   resource_class: large
-  image: ubuntu-2004:202111-02
+  # https://circleci.com/developer/machine/image/ubuntu-2204
+  image: ubuntu-2204:current
   docker_layer_caching: true
 working_directory: ~/kubernetes-monitor
 steps:

test/setup/deployers/operator-openshift.ts

@@ -1,7 +1,9 @@
+import sleep from 'sleep-promise';
 import { readFileSync, writeFileSync } from 'fs';
 import { parse, stringify } from 'yaml';
 import { IDeployer, IImageOptions } from './types';
 import * as kubectl from '../../helpers/kubectl';
+import { execWrapper as exec } from '../../helpers/exec';
 
 export const operatorDeployer: IDeployer = {
   deploy: deployKubernetesMonitor,
@@ -17,10 +19,27 @@ async function deployKubernetesMonitor(
   await kubectl.applyK8sYaml('./test/fixtures/operator/installation.yaml');
   // Await for the Operator to become available, only then
   // the Operator can start processing the custom resource.
-  await kubectl.waitForDeployment('snyk-operator', 'snyk-monitor');
+  await deploymentIsReady('snyk-operator', 'snyk-monitor');
   await kubectl.applyK8sYaml('./test/fixtures/operator/custom-resource.yaml');
 }
 
+async function deploymentIsReady(
+  name: string,
+  namespace: string,
+): Promise<boolean> {
+  for (let attempt = 0; attempt < 180; attempt++) {
+    try {
+      await exec(`./kubectl get deployment.apps/${name} -n ${namespace}`);
+      // Give the deployment enough time to settle and apply the CRD
+      await sleep(60_000);
+      return true;
+    } catch (error) {
+      await sleep(1000);
+    }
+  }
+  return false;
+}
+
 function createTestOperatorSource(newYamlPath: string): void {
   console.log('Creating YAML CatalogSource...');
   const operatorVersion =

test/setup/index.ts

@@ -196,7 +196,16 @@ export async function deployMonitor(): Promise<string> {
       pullPolicy: imagePullPolicy,
     };
     await deployers[deploymentType].deploy(deploymentImageOptions);
-    await kubectl.waitForDeployment('snyk-monitor', namespace);
+    for (let attempt = 0; attempt < 180; attempt++) {
+      try {
+        await exec(
+          `./kubectl get deployment.apps/snyk-monitor -n ${namespace}`,
+        );
+        break;
+      } catch {
+        await sleep(1000);
+      }
+    }
 
     console.log(
       `Deployed the snyk-monitor with integration ID ${integrationId}`,

test/setup/platforms/openshift4.ts

@@ -152,10 +152,14 @@ export async function clean(): Promise<void> {
       .deleteResource('--all', 'all,sa,cm,secret,pvc,rollouts', 'services')
       .catch(() => undefined),
     kubectl
-      .deleteResource('--all', 'all,sa,cm,secret,pvc', 'argo-rollout')
+      .deleteResource('--all', 'all,sa,cm,secret,pvc,rollouts', 'argo-rollouts')
       .catch(() => undefined),
     kubectl
-      .deleteResource('--all', 'all,sa,cm,secret,pvc', 'snyk-monitor')
+      .deleteResource(
+        '--all',
+        'all,sa,cm,secret,pvc,subscription,installplan,csv',
+        'snyk-monitor',
+      )
       .catch(() => undefined),
   ]);