Add new cluster profiles - aws-gluster and gcp-logging by vrutkovs · Pull Request #176 · openshift/ci-operator

vrutkovs · 2018-10-10T16:25:00Z

Related to openshift/release#1878 and openshift/release#1866

This also adds new test types - openshift-ansible upgrade and custom openshift-ansible provisioners.

Fixes #175

droslean · 2018-10-10T18:00:01Z

/hold
You should update also the validations.

bbguimaraes · 2018-10-11T08:57:26Z

Since you're doing this, you can also add the test types for #175. The existing test types are here:

ci-operator/pkg/api/types.go

Lines 290 to 293 in e36b62b

    
           ContainerTestConfiguration                  *ContainerTestConfiguration                  `json:"container,omitempty"` 
        
           OpenshiftAnsibleClusterTestConfiguration    *OpenshiftAnsibleClusterTestConfiguration    `json:"openshift_ansible,omitempty"` 
        
           OpenshiftAnsibleSrcClusterTestConfiguration *OpenshiftAnsibleSrcClusterTestConfiguration `json:"openshift_ansible_src,omitempty"` 
        
           OpenshiftInstallerClusterTestConfiguration  *OpenshiftInstallerClusterTestConfiguration  `json:"openshift_installer,omitempty"`

Once they are valid ci-operator test types, we can change the generator to support those templates.

stevekuznetsov · 2018-10-11T09:14:43Z

CONFIGURATION.md

    target_cloud: ''
+  openshift_ansible_upgrade:
+    target_cloud: ''
+    previous_ansible_version: ''


This seems like it could mirror tag_specification and fully define the previous release, so you don't need to explicitly provide the version, image and RPMs

It seems previous_version and previous_rpm_deps should be sufficient

vrutkovs · 2018-10-11T09:26:20Z

CONFIGURATION.md

  openshift_ansible_src:
    target_cloud: ''
+  openshift_ansible_upgrade:
+    target_cloud: ''


Not sure why the docs state this field is target_cloud and the class json field is cluster_profile. Docs issue?

I blame the happy hour.

stevekuznetsov · 2018-10-11T10:23:09Z

pkg/api/config.go

 		needsReleaseRpms = true
 		validationErrors = append(validationErrors, validateClusterProfile(fmt.Sprintf("%s", fieldRoot), testConfig.ClusterProfile))
 	}
+	if testConfig := test.OpenshiftAnsibleUpgradeClusterTestConfiguration; testConfig != nil {


Do similar for custom?

stevekuznetsov · 2018-10-11T10:43:31Z

/unassign
/assign @bbguimaraes

bbguimaraes · 2018-10-12T07:44:41Z

pkg/api/types.go

+	ClusterProfile  ClusterProfile `json:"cluster_profile"`
+	PreviousVersion string         `json:"previous_version"`
+	PreviousRPMDeps string         `json:"previous_rpm_deps"`
+}


It doesn't look like you need this separate struct. These fields can be added to OpenshiftAnsibleUpgradeClusterTestConfiguration directly.

Because clusters are always upgraded from one version to the next, these could also be derived automatically from tag_specification.

Deriving previous version is fairly complicated, 4.0 -> 3.11 (it could as well be 3.12 -> 3.11), previous RPM deps repo is not easy too

Additional struct is for this is no longer created

…ecific test config

bbguimaraes · 2018-10-12T12:51:56Z

/lgtm

openshift-ci-robot · 2018-10-12T12:52:04Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bbguimaraes, vrutkovs

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [bbguimaraes]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

bbguimaraes · 2018-10-12T13:59:50Z

/hold cancel

openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Oct 10, 2018

openshift-ci-robot requested review from smarterclayton and stevekuznetsov October 10, 2018 16:25

vrutkovs mentioned this pull request Oct 10, 2018

Add new cluster profiles - aws-gluster and gcp-logging openshift/ci-operator-prowgen#34

Closed

vrutkovs force-pushed the cluster-types-gluster-logging branch from 919cfbb to 8dd26de Compare October 10, 2018 17:37

openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 10, 2018

openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 10, 2018

vrutkovs force-pushed the cluster-types-gluster-logging branch from 8dd26de to 92d1eb3 Compare October 11, 2018 09:05

openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 11, 2018

stevekuznetsov reviewed Oct 11, 2018

View reviewed changes

vrutkovs force-pushed the cluster-types-gluster-logging branch 3 times, most recently from b234481 to 2c8d76b Compare October 11, 2018 09:23

vrutkovs commented Oct 11, 2018

View reviewed changes

vrutkovs force-pushed the cluster-types-gluster-logging branch from 2c8d76b to a1c6330 Compare October 11, 2018 09:49

openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 11, 2018

Vadim Rutkovsky added 2 commits October 11, 2018 11:51

Add new cluster profiles - aws-gluster and gcp-logging

45ed57d

Add openshift_ansible_upgrade test type

40ad537

vrutkovs force-pushed the cluster-types-gluster-logging branch from a1c6330 to 40ad537 Compare October 11, 2018 09:54

openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 11, 2018

stevekuznetsov reviewed Oct 11, 2018

View reviewed changes

Add openshift_ansible_custom test type

ac9af1d

vrutkovs force-pushed the cluster-types-gluster-logging branch from d8392b6 to ac9af1d Compare October 11, 2018 10:27

openshift-ci-robot assigned bbguimaraes Oct 11, 2018

bbguimaraes suggested changes Oct 12, 2018

View reviewed changes

Move config fields from ClusterUpgradeTestConfiguration to upgrade-sp…

9d78bf5

…ecific test config

bbguimaraes mentioned this pull request Oct 12, 2018

Add an e2e-openstack job openshift/release#1824

Merged

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 12, 2018

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 12, 2018

openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 12, 2018

openshift-merge-robot merged commit 1cac8bc into openshift:master Oct 12, 2018

vrutkovs deleted the cluster-types-gluster-logging branch May 16, 2019 11:23

Conversation

vrutkovs commented Oct 10, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

droslean commented Oct 10, 2018

Uh oh!

bbguimaraes commented Oct 11, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

stevekuznetsov commented Oct 11, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bbguimaraes commented Oct 12, 2018

Uh oh!

openshift-ci-robot commented Oct 12, 2018

Uh oh!

bbguimaraes commented Oct 12, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

vrutkovs commented Oct 10, 2018 •

edited

Loading