From 9b05fd5f9386fbe9085229998609041aa714f02b Mon Sep 17 00:00:00 2001
From: Matteo Silvestri <matteosilv@gmail.com>
Date: Thu, 1 Sep 2022 11:49:59 +0200
Subject: [PATCH] apply requested pr changes

Signed-off-by: Matteo Silvestri <matteosilv@gmail.com>
---
 .github/workflows/verify_kubernetes.yml              | 12 +++++-------
 packages/backend-common/package.json                 |  2 +-
 .../src/util/KubernetesContainerRunner.test.ts       |  4 +++-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/verify_kubernetes.yml b/.github/workflows/verify_kubernetes.yml
index 33acb9dbc1..7c692c4457 100644
--- a/.github/workflows/verify_kubernetes.yml
+++ b/.github/workflows/verify_kubernetes.yml
@@ -1,10 +1,10 @@
-name: KubernetesContainerRunner
+name: E2E Test Kubernetes
 on:
   pull_request:
     paths:
       - 'yarn.lock'
       - '.github/workflows/verify_kubernetes.yml'
-      - 'packages/backend-common/src/util/**'
+      - 'packages/backend-common/src/**'
 
 jobs:
   verify:
@@ -16,12 +16,10 @@ jobs:
 
     env:
       CI: true
-      KUBERNETES: true
+      KUBERNETES_TESTS: true
 
     steps:
       - uses: actions/checkout@v3
-      - name: fetch branch master
-        run: git fetch origin master
 
       - name: use node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
@@ -37,6 +35,6 @@ jobs:
       - name: bootstrap kind
         uses: helm/kind-action@v1.3.0
 
-      - name: techdocs-cli kubernetes test
+      - name: kubernetes test
         working-directory: packages/backend-common
-        run: yarn test:kubernetes:ci
+        run: yarn test:kubernetes
diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json
index b0e573d533..1cc289e8c2 100644
--- a/packages/backend-common/package.json
+++ b/packages/backend-common/package.json
@@ -32,7 +32,7 @@
     "postpack": "backstage-cli package postpack",
     "clean": "backstage-cli package clean",
     "start": "backstage-cli package start",
-    "test:kubernetes:ci": "backstage-cli test -t KubernetesContainerRunner --watchAll=false --ci"
+    "test:kubernetes": "backstage-cli package test -t KubernetesContainerRunner --no-watch"
   },
   "dependencies": {
     "@backstage/cli-common": "^0.1.9",
diff --git a/packages/backend-common/src/util/KubernetesContainerRunner.test.ts b/packages/backend-common/src/util/KubernetesContainerRunner.test.ts
index c3a53659fd..081b05a4b6 100644
--- a/packages/backend-common/src/util/KubernetesContainerRunner.test.ts
+++ b/packages/backend-common/src/util/KubernetesContainerRunner.test.ts
@@ -26,7 +26,9 @@ import {
 import { RunContainerOptions } from './ContainerRunner';
 import { PassThrough } from 'stream';
 
-const describeIfKubernetes = Boolean(process.env.KUBERNETES)
+// This ensures E2E tests that require a Kubernetes cluster are only run
+// where KUBERNETES_TESTS environment variable is true
+const describeIfKubernetes = Boolean(process.env.KUBERNETES_TESTS)
   ? describe
   : describe.skip;