From b7b06b9de3622ae0c4ff70299f794cf2c0a87e44 Mon Sep 17 00:00:00 2001
From: Josh Kneubuhl <jkneubuh@us.ibm.com>
Date: Mon, 14 Nov 2022 16:41:44 -0500
Subject: [PATCH] Move Kube Test Network tests from Azure -> GHA

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
---
 .github/workflows/test-network-k8s.yaml | 66 +++++++++++++++++++++++++
 ci/azure-pipelines.yml                  | 30 -----------
 2 files changed, 66 insertions(+), 30 deletions(-)
 create mode 100644 .github/workflows/test-network-k8s.yaml

diff --git a/.github/workflows/test-network-k8s.yaml b/.github/workflows/test-network-k8s.yaml
new file mode 100644
index 00000000..ea99078c
--- /dev/null
+++ b/.github/workflows/test-network-k8s.yaml
@@ -0,0 +1,66 @@
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+name: Kubernetes Test Network
+run-name: ${{ github.actor }} is testing the Kubernetes Test Network
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  ccaas-java:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Test the network
+        working-directory: test-network-k8s
+        run: ../ci/scripts/run-k8s-test-network-basic.sh
+        env:
+          CLIENT_LANGUAGE: typescript
+          CHAINCODE_LANGUAGE: java
+
+  ccaas-external:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Test the network
+        working-directory: test-network-k8s
+        run: ../ci/scripts/run-k8s-test-network-basic.sh
+        env:
+          CLIENT_LANGUAGE: typescript
+          CHAINCODE_LANGUAGE: external
+
+  k8s-builder:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Test the network
+        working-directory: test-network-k8s
+        run: ../ci/scripts/run-k8s-test-network-basic.sh
+        env:
+          CHAINCODE_NAME: basic
+          CHAINCODE_LANGUAGE: java
+          CHAINCODE_BUILDER: k8s
+
+  multi-namespace:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Test the network
+        working-directory: test-network-k8s
+        run: ../ci/scripts/run-k8s-test-network-basic.sh
+        env:
+          ORG0_NS: org0-namespace
+          ORG1_NS: org1-namespace
+          ORG2_NS: org2-namespace
+          CHAINCODE_NAME: basic
+          CHAINCODE_LANGUAGE: java
+          CHAINCODE_BUILDER: k8s
diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml
index fa15f174..306d4d57 100644
--- a/ci/azure-pipelines.yml
+++ b/ci/azure-pipelines.yml
@@ -31,36 +31,6 @@ jobs:
     steps:
       - template: templates/asset-transfer-basic/azure-pipelines-rest.yml
 
-  - job: KubeTestNetworkBasic
-    displayName: Kube Test Network
-    pool:
-      vmImage: ubuntu-20.04
-    strategy:
-      matrix:
-        CCaaS-Java:
-          CLIENT_LANGUAGE: typescript
-          CHAINCODE_LANGUAGE: java
-        CCaaS-Golang:
-          CLIENT_LANGUAGE: typescript
-          CHAINCODE_LANGUAGE: external
-        K8s-Builder-Java:
-          CHAINCODE_NAME: basic
-          CHAINCODE_LANGUAGE: java
-          CHAINCODE_BUILDER: k8s
-        Multi-Namespace:
-          ORG0_NS: org0-namespace
-          ORG1_NS: org1-namespace
-          ORG2_NS: org2-namespace
-          CHAINCODE_NAME: basic
-          CHAINCODE_LANGUAGE: java
-          CHAINCODE_BUILDER: k8s
-
-    steps:
-      - template: templates/install-k8s-deps.yml
-      - script: ../ci/scripts/run-k8s-test-network-basic.sh
-        workingDirectory: test-network-k8s
-        displayName: Run Kubernetes Test Network Basic Asset Transfer
-
   - job: TestNetworkLedger
     displayName: Test Network
     pool: