Adjust Hypershift AKS management jobs (#55616)

Signed-off-by: Feilian Xie <fxie@redhat.com>
openshift · Aug 21, 2024 · 4b6d5dc · 4b6d5dc
1 parent 9d61a2f
commit 4b6d5dc
Show file tree

Hide file tree

Showing 8 changed files with 79 additions and 73 deletions.
diff --git a/...penshift-tests-private/openshift-openshift-tests-private-release-4.16__amd64-nightly.yaml b/...penshift-tests-private/openshift-openshift-tests-private-release-4.16__amd64-nightly.yaml
@@ -1565,6 +1565,20 @@ tests:
     test:
     - chain: openshift-e2e-test-hypershift-qe-longduration
     workflow: cucushift-installer-rehearse-azure-aks-hypershift-byo-vnet-guest
+- as: azure-aks-hypershift-byo-vnet-fips-mgmt-f14
+  cron: 32 0 14,28 * *
+  steps:
+    cluster_profile: azure-qe
+    env:
+      HYPERSHIFT_AZURE_DIAGNOSTICS_STORAGE_ACCOUNT_TYPE: ""
+      HYPERSHIFT_AZURE_MARKETPLACE_IMAGE_PUBLISHER: ""
+      IS_ACTIVE_CLUSTER_OPENSHIFT: "false"
+      TEST_ADDITIONAL: Hypershift
+      TEST_FILTERS: ~ChkUpgrade&;~DisconnectedOnly&;~MicroShiftOnly&;HyperShiftMGMT&
+      TEST_TIMEOUT: "30"
+    test:
+    - chain: openshift-e2e-test-hypershift-qe-mgmt
+    workflow: cucushift-installer-rehearse-azure-aks-hypershift-byo-vnet
 - as: azure-aks-hypershift-cilium-guest-f7
   cron: 32 17 5,12,19,26 * *
   steps:
@@ -1586,18 +1600,6 @@ tests:
     test:
     - chain: openshift-e2e-test-hypershift-qe
     workflow: cucushift-installer-rehearse-azure-aks-hypershift-etcd-disk-encryption-guest
-- as: azure-aks-hypershift-etcd-disk-encryption-mgmt-f14
-  cron: 32 0 14,28 * *
-  steps:
-    cluster_profile: azure-qe
-    env:
-      HYPERSHIFT_AZURE_DIAGNOSTICS_STORAGE_ACCOUNT_TYPE: ""
-      TEST_ADDITIONAL: Hypershift
-      TEST_FILTERS: ~ChkUpgrade&;~DisconnectedOnly&;~MicroShiftOnly&;HyperShiftMGMT&
-      TEST_TIMEOUT: "30"
-    test:
-    - chain: openshift-e2e-test-hypershift-qe-mgmt
-    workflow: cucushift-installer-rehearse-azure-aks-hypershift-etcd-disk-encryption
 - as: azure-aks-hypershift-install-f28-longduration
   cron: 12 7 4 * *
   steps:

diff --git a/...penshift-tests-private/openshift-openshift-tests-private-release-4.17__amd64-nightly.yaml b/...penshift-tests-private/openshift-openshift-tests-private-release-4.17__amd64-nightly.yaml
@@ -1330,6 +1330,18 @@ tests:
     test:
     - chain: openshift-e2e-test-hypershift-qe-longduration
     workflow: cucushift-installer-rehearse-azure-aks-hypershift-byo-vnet-guest
+- as: azure-aks-hypershift-byo-vnet-fips-mgmt-f14
+  cron: 30 12 9,23 * *
+  steps:
+    cluster_profile: azure-qe
+    env:
+      IS_ACTIVE_CLUSTER_OPENSHIFT: "false"
+      TEST_ADDITIONAL: Hypershift
+      TEST_FILTERS: ~ChkUpgrade&;~DisconnectedOnly&;~MicroShiftOnly&;HyperShiftMGMT&
+      TEST_TIMEOUT: "30"
+    test:
+    - chain: openshift-e2e-test-hypershift-qe-mgmt
+    workflow: cucushift-installer-rehearse-azure-aks-hypershift-byo-vnet
 - as: azure-aks-hypershift-cilium-guest-f7
   cron: 0 9 3,10,17,26 * *
   steps:
@@ -1350,17 +1362,6 @@ tests:
     test:
     - chain: openshift-e2e-test-hypershift-qe
     workflow: cucushift-installer-rehearse-azure-aks-hypershift-etcd-disk-encryption-guest
-- as: azure-aks-hypershift-etcd-disk-encryption-mgmt-f14
-  cron: 30 12 9,23 * *
-  steps:
-    cluster_profile: azure-qe
-    env:
-      TEST_ADDITIONAL: Hypershift
-      TEST_FILTERS: ~ChkUpgrade&;~DisconnectedOnly&;~MicroShiftOnly&;HyperShiftMGMT&
-      TEST_TIMEOUT: "30"
-    test:
-    - chain: openshift-e2e-test-hypershift-qe-mgmt
-    workflow: cucushift-installer-rehearse-azure-aks-hypershift-etcd-disk-encryption
 - as: azure-aks-hypershift-install-f28-longduration
   cron: 55 9 10 * *
   steps:

diff --git a/...ift/openshift-tests-private/openshift-openshift-tests-private-release-4.16-periodics.yaml b/...ift/openshift-tests-private/openshift-openshift-tests-private-release-4.16-periodics.yaml
@@ -18482,7 +18482,7 @@ periodics:
         secretName: result-aggregator
 - agent: kubernetes
   cluster: build03
-  cron: 32 17 5,12,19,26 * *
+  cron: 32 0 14,28 * *
   decorate: true
   decoration_config:
     skip_cloning: true
@@ -18497,7 +18497,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.16"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-openshift-tests-private-release-4.16-amd64-nightly-azure-aks-hypershift-cilium-guest-f7
+  name: periodic-ci-openshift-openshift-tests-private-release-4.16-amd64-nightly-azure-aks-hypershift-byo-vnet-fips-mgmt-f14
   spec:
     containers:
     - args:
@@ -18507,8 +18507,8 @@ periodics:
       - --oauth-token-path=/usr/local/github-credentials/oauth
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --secret-dir=/usr/local/azure-aks-hypershift-cilium-guest-f7-cluster-profile
-      - --target=azure-aks-hypershift-cilium-guest-f7
+      - --secret-dir=/usr/local/azure-aks-hypershift-byo-vnet-fips-mgmt-f14-cluster-profile
+      - --target=azure-aks-hypershift-byo-vnet-fips-mgmt-f14
       - --variant=amd64-nightly
       command:
       - ci-operator
@@ -18525,7 +18525,7 @@ periodics:
       - mountPath: /secrets/ci-pull-credentials
         name: ci-pull-credentials
         readOnly: true
-      - mountPath: /usr/local/azure-aks-hypershift-cilium-guest-f7-cluster-profile
+      - mountPath: /usr/local/azure-aks-hypershift-byo-vnet-fips-mgmt-f14-cluster-profile
         name: cluster-profile
       - mountPath: /secrets/gcs
         name: gcs-credentials
@@ -18570,7 +18570,7 @@ periodics:
         secretName: result-aggregator
 - agent: kubernetes
   cluster: build03
-  cron: 57 11 1,8,15,24 * *
+  cron: 32 17 5,12,19,26 * *
   decorate: true
   decoration_config:
     skip_cloning: true
@@ -18585,7 +18585,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.16"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-openshift-tests-private-release-4.16-amd64-nightly-azure-aks-hypershift-etcd-disk-encryption-guest-f7
+  name: periodic-ci-openshift-openshift-tests-private-release-4.16-amd64-nightly-azure-aks-hypershift-cilium-guest-f7
   spec:
     containers:
     - args:
@@ -18595,8 +18595,8 @@ periodics:
       - --oauth-token-path=/usr/local/github-credentials/oauth
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --secret-dir=/usr/local/azure-aks-hypershift-etcd-disk-encryption-guest-f7-cluster-profile
-      - --target=azure-aks-hypershift-etcd-disk-encryption-guest-f7
+      - --secret-dir=/usr/local/azure-aks-hypershift-cilium-guest-f7-cluster-profile
+      - --target=azure-aks-hypershift-cilium-guest-f7
       - --variant=amd64-nightly
       command:
       - ci-operator
@@ -18613,7 +18613,7 @@ periodics:
       - mountPath: /secrets/ci-pull-credentials
         name: ci-pull-credentials
         readOnly: true
-      - mountPath: /usr/local/azure-aks-hypershift-etcd-disk-encryption-guest-f7-cluster-profile
+      - mountPath: /usr/local/azure-aks-hypershift-cilium-guest-f7-cluster-profile
         name: cluster-profile
       - mountPath: /secrets/gcs
         name: gcs-credentials
@@ -18658,7 +18658,7 @@ periodics:
         secretName: result-aggregator
 - agent: kubernetes
   cluster: build03
-  cron: 32 0 14,28 * *
+  cron: 57 11 1,8,15,24 * *
   decorate: true
   decoration_config:
     skip_cloning: true
@@ -18673,7 +18673,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.16"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-openshift-tests-private-release-4.16-amd64-nightly-azure-aks-hypershift-etcd-disk-encryption-mgmt-f14
+  name: periodic-ci-openshift-openshift-tests-private-release-4.16-amd64-nightly-azure-aks-hypershift-etcd-disk-encryption-guest-f7
   spec:
     containers:
     - args:
@@ -18683,8 +18683,8 @@ periodics:
       - --oauth-token-path=/usr/local/github-credentials/oauth
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --secret-dir=/usr/local/azure-aks-hypershift-etcd-disk-encryption-mgmt-f14-cluster-profile
-      - --target=azure-aks-hypershift-etcd-disk-encryption-mgmt-f14
+      - --secret-dir=/usr/local/azure-aks-hypershift-etcd-disk-encryption-guest-f7-cluster-profile
+      - --target=azure-aks-hypershift-etcd-disk-encryption-guest-f7
       - --variant=amd64-nightly
       command:
       - ci-operator
@@ -18701,7 +18701,7 @@ periodics:
       - mountPath: /secrets/ci-pull-credentials
         name: ci-pull-credentials
         readOnly: true
-      - mountPath: /usr/local/azure-aks-hypershift-etcd-disk-encryption-mgmt-f14-cluster-profile
+      - mountPath: /usr/local/azure-aks-hypershift-etcd-disk-encryption-guest-f7-cluster-profile
         name: cluster-profile
       - mountPath: /secrets/gcs
         name: gcs-credentials

diff --git a/...ift/openshift-tests-private/openshift-openshift-tests-private-release-4.17-periodics.yaml b/...ift/openshift-tests-private/openshift-openshift-tests-private-release-4.17-periodics.yaml
@@ -25935,7 +25935,7 @@ periodics:
         secretName: result-aggregator
 - agent: kubernetes
   cluster: build03
-  cron: 0 9 3,10,17,26 * *
+  cron: 30 12 9,23 * *
   decorate: true
   decoration_config:
     skip_cloning: true
@@ -25950,7 +25950,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.17"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-openshift-tests-private-release-4.17-amd64-nightly-azure-aks-hypershift-cilium-guest-f7
+  name: periodic-ci-openshift-openshift-tests-private-release-4.17-amd64-nightly-azure-aks-hypershift-byo-vnet-fips-mgmt-f14
   spec:
     containers:
     - args:
@@ -25960,8 +25960,8 @@ periodics:
       - --oauth-token-path=/usr/local/github-credentials/oauth
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --secret-dir=/usr/local/azure-aks-hypershift-cilium-guest-f7-cluster-profile
-      - --target=azure-aks-hypershift-cilium-guest-f7
+      - --secret-dir=/usr/local/azure-aks-hypershift-byo-vnet-fips-mgmt-f14-cluster-profile
+      - --target=azure-aks-hypershift-byo-vnet-fips-mgmt-f14
       - --variant=amd64-nightly
       command:
       - ci-operator
@@ -25978,7 +25978,7 @@ periodics:
       - mountPath: /secrets/ci-pull-credentials
         name: ci-pull-credentials
         readOnly: true
-      - mountPath: /usr/local/azure-aks-hypershift-cilium-guest-f7-cluster-profile
+      - mountPath: /usr/local/azure-aks-hypershift-byo-vnet-fips-mgmt-f14-cluster-profile
         name: cluster-profile
       - mountPath: /secrets/gcs
         name: gcs-credentials
@@ -26023,7 +26023,7 @@ periodics:
         secretName: result-aggregator
 - agent: kubernetes
   cluster: build03
-  cron: 16 2 5,12,19,26 * *
+  cron: 0 9 3,10,17,26 * *
   decorate: true
   decoration_config:
     skip_cloning: true
@@ -26038,7 +26038,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.17"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-openshift-tests-private-release-4.17-amd64-nightly-azure-aks-hypershift-etcd-disk-encryption-guest-f7
+  name: periodic-ci-openshift-openshift-tests-private-release-4.17-amd64-nightly-azure-aks-hypershift-cilium-guest-f7
   spec:
     containers:
     - args:
@@ -26048,8 +26048,8 @@ periodics:
       - --oauth-token-path=/usr/local/github-credentials/oauth
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --secret-dir=/usr/local/azure-aks-hypershift-etcd-disk-encryption-guest-f7-cluster-profile
-      - --target=azure-aks-hypershift-etcd-disk-encryption-guest-f7
+      - --secret-dir=/usr/local/azure-aks-hypershift-cilium-guest-f7-cluster-profile
+      - --target=azure-aks-hypershift-cilium-guest-f7
       - --variant=amd64-nightly
       command:
       - ci-operator
@@ -26066,7 +26066,7 @@ periodics:
       - mountPath: /secrets/ci-pull-credentials
         name: ci-pull-credentials
         readOnly: true
-      - mountPath: /usr/local/azure-aks-hypershift-etcd-disk-encryption-guest-f7-cluster-profile
+      - mountPath: /usr/local/azure-aks-hypershift-cilium-guest-f7-cluster-profile
         name: cluster-profile
       - mountPath: /secrets/gcs
         name: gcs-credentials
@@ -26111,7 +26111,7 @@ periodics:
         secretName: result-aggregator
 - agent: kubernetes
   cluster: build03
-  cron: 30 12 9,23 * *
+  cron: 16 2 5,12,19,26 * *
   decorate: true
   decoration_config:
     skip_cloning: true
@@ -26126,7 +26126,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.17"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-openshift-tests-private-release-4.17-amd64-nightly-azure-aks-hypershift-etcd-disk-encryption-mgmt-f14
+  name: periodic-ci-openshift-openshift-tests-private-release-4.17-amd64-nightly-azure-aks-hypershift-etcd-disk-encryption-guest-f7
   spec:
     containers:
     - args:
@@ -26136,8 +26136,8 @@ periodics:
       - --oauth-token-path=/usr/local/github-credentials/oauth
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --secret-dir=/usr/local/azure-aks-hypershift-etcd-disk-encryption-mgmt-f14-cluster-profile
-      - --target=azure-aks-hypershift-etcd-disk-encryption-mgmt-f14
+      - --secret-dir=/usr/local/azure-aks-hypershift-etcd-disk-encryption-guest-f7-cluster-profile
+      - --target=azure-aks-hypershift-etcd-disk-encryption-guest-f7
       - --variant=amd64-nightly
       command:
       - ci-operator
@@ -26154,7 +26154,7 @@ periodics:
       - mountPath: /secrets/ci-pull-credentials
         name: ci-pull-credentials
         readOnly: true
-      - mountPath: /usr/local/azure-aks-hypershift-etcd-disk-encryption-mgmt-f14-cluster-profile
+      - mountPath: /usr/local/azure-aks-hypershift-etcd-disk-encryption-guest-f7-cluster-profile
         name: cluster-profile
       - mountPath: /secrets/gcs
         name: gcs-credentials

diff --git a/ci-operator/step-registry/cucushift/installer/rehearse/azure/aks/hypershift/OWNERS b/ci-operator/step-registry/cucushift/installer/rehearse/azure/aks/hypershift/OWNERS
@@ -7,10 +7,4 @@ approvers:
 - heliubj18
 - LiangquanLi930
 reviewers:
-- jianlinliu
-- yunjiang29
-- gpei
-- jinyunma
-- fxierh
-- heliubj18
-- LiangquanLi930
+- fxierh
diff --git a/ci-operator/step-registry/cucushift/installer/rehearse/azure/aks/hypershift/byo-vnet/OWNERS b/ci-operator/step-registry/cucushift/installer/rehearse/azure/aks/hypershift/byo-vnet/OWNERS
@@ -1,16 +1,4 @@
 approvers:
-- jianlinliu
-- yunjiang29
-- gpei
-- jinyunma
 - fxierh
-- heliubj18
-- LiangquanLi930
 reviewers:
-- jianlinliu
-- yunjiang29
-- gpei
-- jinyunma
-- fxierh
-- heliubj18
-- LiangquanLi930
+- fxierh
diff --git a/...yo-vnet/cucushift-installer-rehearse-azure-aks-hypershift-byo-vnet-workflow.metadata.json b/...yo-vnet/cucushift-installer-rehearse-azure-aks-hypershift-byo-vnet-workflow.metadata.json
@@ -0,0 +1,11 @@
+{
+	"path": "cucushift/installer/rehearse/azure/aks/hypershift/byo-vnet/cucushift-installer-rehearse-azure-aks-hypershift-byo-vnet-workflow.yaml",
+	"owners": {
+		"approvers": [
+			"fxierh"
+		],
+		"reviewers": [
+			"fxierh"
+		]
+	}
+}
diff --git a/...ershift/byo-vnet/cucushift-installer-rehearse-azure-aks-hypershift-byo-vnet-workflow.yaml b/...ershift/byo-vnet/cucushift-installer-rehearse-azure-aks-hypershift-byo-vnet-workflow.yaml
@@ -0,0 +1,10 @@
+workflow:
+  as: cucushift-installer-rehearse-azure-aks-hypershift-byo-vnet
+  steps:
+    pre:
+    - chain: cucushift-installer-rehearse-azure-aks-hypershift-byo-vnet-provision
+    post:
+    - chain: cucushift-installer-rehearse-azure-aks-hypershift-byo-vnet-deprovision
+  documentation: |-
+    This workflow creates and later destroys an aks management cluster and a public hosted cluster 
+    using BYO vnet, subnet and nsg. oc commands in the tests will target the management cluster.