config-brancher --config-dir ./ci-operator/config --current-release 4…

….6 --future-release 4.7 --confirm
wking · Sep 17, 2020 · a842318 · a842318
1 parent 0193eb8
commit a842318
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 16 deletions.
diff --git a/...hyperconverged-cluster-operator/kubevirt-hyperconverged-cluster-operator-release-4.6.yaml b/...hyperconverged-cluster-operator/kubevirt-hyperconverged-cluster-operator-release-4.6.yaml
@@ -1,14 +1,14 @@
 base_images:
   base:
-    name: "4.5"
+    name: "4.6"
     namespace: ocp
     tag: base
   cli:
-    name: "4.5"
+    name: "4.6"
     namespace: ocp
     tag: cli
   operator-registry:
-    name: "4.5"
+    name: "4.6"
     namespace: ocp
     tag: operator-registry
 binary_build_commands: make install
@@ -78,6 +78,25 @@ tests:
     make start && make functest
   openshift_installer_src:
     cluster_profile: aws
+- as: hco-e2e-image-index-azure
+  steps:
+    cluster_profile: azure4
+    env:
+      OO_CHANNEL: 1.2.0
+      OO_INSTALL_NAMESPACE: kubevirt-hyperconverged
+      OO_PACKAGE: kubevirt-hyperconverged
+      OO_TARGET_NAMESPACES: '!install'
+    test:
+    - as: e2e-test
+      commands: |
+        make deploy_cr
+        make functest
+      from: hco-oc-bin-image
+      resources:
+        requests:
+          cpu: 100m
+          memory: 200Mi
+    workflow: optional-operators-ci-azure
 - as: hco-e2e-image-index-aws
   steps:
     cluster_profile: aws

diff --git a/...hyperconverged-cluster-operator/kubevirt-hyperconverged-cluster-operator-release-4.7.yaml b/...hyperconverged-cluster-operator/kubevirt-hyperconverged-cluster-operator-release-4.7.yaml
@@ -1,14 +1,14 @@
 base_images:
   base:
-    name: "4.5"
+    name: "4.7"
     namespace: ocp
     tag: base
   cli:
-    name: "4.5"
+    name: "4.7"
     namespace: ocp
     tag: cli
   operator-registry:
-    name: "4.5"
+    name: "4.7"
     namespace: ocp
     tag: operator-registry
 binary_build_commands: make install
@@ -77,6 +77,25 @@ tests:
     make start && make functest
   openshift_installer_src:
     cluster_profile: aws
+- as: hco-e2e-image-index-azure
+  steps:
+    cluster_profile: azure4
+    env:
+      OO_CHANNEL: 1.2.0
+      OO_INSTALL_NAMESPACE: kubevirt-hyperconverged
+      OO_PACKAGE: kubevirt-hyperconverged
+      OO_TARGET_NAMESPACES: '!install'
+    test:
+    - as: e2e-test
+      commands: |
+        make deploy_cr
+        make functest
+      from: hco-oc-bin-image
+      resources:
+        requests:
+          cpu: 100m
+          memory: 200Mi
+    workflow: optional-operators-ci-azure
 - as: hco-e2e-image-index-aws
   steps:
     cluster_profile: aws

diff --git a/...luster-authentication-operator/openshift-cluster-authentication-operator-release-4.6.yaml b/...luster-authentication-operator/openshift-cluster-authentication-operator-release-4.6.yaml
@@ -7,6 +7,10 @@ base_images:
     name: builder
     namespace: ocp
     tag: golang-1.14
+  ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.15-openshift-4.6
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -21,9 +25,9 @@ images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-openshift-4.6:
+    ocp_builder_rhel-8-golang-1.15-openshift-4.6:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6
+      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6
   to: cluster-authentication-operator
 promotion:
   disabled: true

diff --git a/...luster-authentication-operator/openshift-cluster-authentication-operator-release-4.7.yaml b/...luster-authentication-operator/openshift-cluster-authentication-operator-release-4.7.yaml
@@ -7,6 +7,10 @@ base_images:
     name: builder
     namespace: ocp
     tag: golang-1.14
+  ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.15-openshift-4.6
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -21,9 +25,9 @@ images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-openshift-4.6:
+    ocp_builder_rhel-8-golang-1.15-openshift-4.6:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6
+      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6
   to: cluster-authentication-operator
 promotion:
   name: "4.7"

diff --git a/...ig/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.6.yaml b/...ig/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.6.yaml
@@ -7,6 +7,10 @@ base_images:
     name: builder
     namespace: ocp
     tag: golang-1.14
+  ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.15-openshift-4.6
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -28,9 +32,9 @@ images:
 - dockerfile_path: Dockerfile.rhel
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-openshift-4.6:
+    ocp_builder_rhel-8-golang-1.15-openshift-4.6:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6
+      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6
   to: cluster-version-operator
 promotion:
   disabled: true

diff --git a/...ig/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.7.yaml b/...ig/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.7.yaml
@@ -7,6 +7,10 @@ base_images:
     name: builder
     namespace: ocp
     tag: golang-1.14
+  ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.15-openshift-4.6
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -28,9 +32,9 @@ images:
 - dockerfile_path: Dockerfile.rhel
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-openshift-4.6:
+    ocp_builder_rhel-8-golang-1.15-openshift-4.6:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6
+      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6
   to: cluster-version-operator
 promotion:
   name: "4.7"

diff --git a/...nfig/openshift/file-integrity-operator/openshift-file-integrity-operator-release-4.6.yaml b/...nfig/openshift/file-integrity-operator/openshift-file-integrity-operator-release-4.6.yaml
@@ -15,7 +15,7 @@ build_root:
   image_stream_tag:
     name: release
     namespace: openshift
-    tag: golang-1.13
+    tag: golang-1.14
 images:
 - dockerfile_path: Dockerfile.ci
   inputs:

diff --git a/...nfig/openshift/file-integrity-operator/openshift-file-integrity-operator-release-4.7.yaml b/...nfig/openshift/file-integrity-operator/openshift-file-integrity-operator-release-4.7.yaml
@@ -15,7 +15,7 @@ build_root:
   image_stream_tag:
     name: release
     namespace: openshift
-    tag: golang-1.13
+    tag: golang-1.14
 images:
 - dockerfile_path: Dockerfile.ci
   inputs: