Merge pull request #9430 from yaacov/deploy-versioned-hco-for-prow

Deploy versioned HCO for prow
openshift · Jul 8, 2021 · e2bd605 · e2bd605
2 parents 3aa19e0 + 36b3841
commit e2bd605
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 10 deletions.
diff --git a/...bevirt-plugin/integration-tests-cypress/tests/vm-template/custom-template-support.spec.ts b/...bevirt-plugin/integration-tests-cypress/tests/vm-template/custom-template-support.spec.ts
@@ -102,7 +102,7 @@ describe('test custom template creation support', () => {
     );
   });
 
-  it('ID(CNV-5729) create custom template from common template with a boot source', () => {
+  xit('ID(CNV-5729) create custom template from common template with a boot source', () => {
     const NEW_TEMPLATE_NAME = `foo-with-source-${testName}`;
     const VM_NAME_WITH_BOOT_SOURCE = `foo-vm-with-source-${testName}`;
 

diff --git a/frontend/packages/kubevirt-plugin/integration-tests/deploy-kubevirt-gating.sh b/frontend/packages/kubevirt-plugin/integration-tests/deploy-kubevirt-gating.sh
@@ -5,13 +5,54 @@ export ON_CI="ON_CI"
 # -----------------
 # Install HCO (kubevirt and helper operators)
 
-# Note: installing main brance is dangerous, we may want to look into a better way. 
-HCO_VERSION="master"
+export HOC_IMAGE_VER=1.5.0-unstable
+export HCO_SUBSCRIPTION_CHANNEL="1.5.0"
 
-curl https://raw.githubusercontent.com/kubevirt/hyperconverged-cluster-operator/$HCO_VERSION/deploy/deploy.sh | bash
+cat <<EOF | oc apply -f -
+apiVersion: operators.coreos.com/v1alpha1
+kind: CatalogSource
+metadata:
+  name: hco-unstable-catalog-source
+  namespace: openshift-marketplace
+spec:
+  sourceType: grpc
+  image: quay.io/kubevirt/hyperconverged-cluster-index:${HOC_IMAGE_VER}
+  displayName: Kubevirt Hyperconverged Cluster Operator
+  publisher: Kubevirt Project
+EOF
+
+cat <<EOF | oc apply -f -
+apiVersion: v1
+kind: Namespace
+metadata:
+    name: kubevirt-hyperconverged
+---
+apiVersion: operators.coreos.com/v1
+kind: OperatorGroup
+metadata:
+    name: kubevirt-hyperconverged-group
+    namespace: kubevirt-hyperconverged
+---
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+    name: hco-operatorhub
+    namespace: kubevirt-hyperconverged
+spec:
+    source: hco-unstable-catalog-source
+    sourceNamespace: openshift-marketplace
+    name: community-kubevirt-hyperconverged
+    channel: ${HCO_SUBSCRIPTION_CHANNEL}
+EOF
+
+# Wait
+sleep 300
+
+oc create -f https://raw.githubusercontent.com/kubevirt/hyperconverged-cluster-operator/main/deploy/hco.cr.yaml \
+  -n kubevirt-hyperconverged
 
-# Wait for kubevirt to be available
-oc -n kubevirt-hyperconverged wait deployment/virt-operator --for=condition=Available --timeout="300s"
+# Wait for kubevirt virt-operator to be available
+oc -n kubevirt-hyperconverged wait deployment/virt-operator --for=condition=Available --timeout="10m"
 
 # -----------------
 # Create storage class and storage namespace for testing

diff --git a/frontend/packages/kubevirt-plugin/package.json b/frontend/packages/kubevirt-plugin/package.json
@@ -35,10 +35,7 @@
         "integration-tests/v2v/*.scenario.ts"
       ],
       "kubevirt-gating": [
-        "integration-tests/tests/example.scenario.ts",
-        "integration-tests/tests/vm.action.base.scenario.ts",
-        "integration-tests/tests/vm.tab.snapshots.scenario.ts",
-        "integration-tests/tests/vmi.actions.scenario.ts"
+        "integration-tests/tests/vm.tab.snapshots.scenario.ts"
       ]
     },
     "exposedModules": {