Skip to content

step-registry: add optional-operator upgrade workflows#17180

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
AlexNPavel:oo-upgrade-workflow
Mar 29, 2021
Merged

step-registry: add optional-operator upgrade workflows#17180
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
AlexNPavel:oo-upgrade-workflow

Conversation

@AlexNPavel
Copy link
Copy Markdown
Contributor

This PR adds optional-operator upgrades workflows to the step registry.

@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 25, 2021
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 25, 2021
@AlexNPavel
Copy link
Copy Markdown
Contributor Author

AlexNPavel commented Mar 25, 2021

At the moment, I have added a new test to ocs-operator to test the new workflows. I will remove that test after the workflows have been successfully rehearsed.

@AlexNPavel AlexNPavel force-pushed the oo-upgrade-workflow branch 6 times, most recently from 8e72bfd to d9e4c25 Compare March 25, 2021 22:35
@petr-muller
Copy link
Copy Markdown
Member

/assign

Copy link
Copy Markdown
Member

@petr-muller petr-muller left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ugh is there anything we can do to not own this :(

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We currently own the entire optional-operators/ci registry section, the OWNERS for the new step is just symlinked to that.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we call it "initial" to be consistent with the terminology we use for OCP releases? Small thing but IMO it matters.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed STARTING to INITIAL and ENDING to LATEST to be more consistent.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder, are we just cargoculting this now? The evvars will be set as step parameters, is there a reason to repeat them? I think this originally comes from CVP installation script which predates multi-stage parameters, but in multi-stage they are nops...

I guess the comments have some value when editing the file, I don't know...

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All the other env vars were there, I just added the 2 new env vars. Since we don't need these declarations, I've removed them in the latest commit.

@AlexNPavel AlexNPavel force-pushed the oo-upgrade-workflow branch from c7dc510 to 21d929c Compare March 26, 2021 16:54
@AlexNPavel
Copy link
Copy Markdown
Contributor Author

/retest

@AlexNPavel
Copy link
Copy Markdown
Contributor Author

/test pj-rehearse

@AlexNPavel AlexNPavel force-pushed the oo-upgrade-workflow branch from 6d2b80f to 8f8fbd3 Compare March 26, 2021 21:13
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Mar 26, 2021

@AlexNPavel: The following tests failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/rehearse/jianzhangbjz/learn-operator/master/learn-oo-test-aws b4487276703711f8fd9339419a536f9d822b9e68 link /test pj-rehearse
ci/rehearse/openshift/ocs-operator/master/ocs-operator-bundle-e2e-aws-upgrade-4.6.3 8e72bfdf535ee2784f9a5185004cab476026e286 link /test pj-rehearse
ci/rehearse/openshift-kni/performance-addon-operators/master/e2e-gcp d9e4c254eb0f3d9915ff5a39f7c79795dcbd7474 link /test pj-rehearse
ci/rehearse/kubevirt/hyperconverged-cluster-operator/master/hco-e2e-image-index-aws 6d2b80f2cf63ce49c48d3ff7d30028e234f0141d link /test pj-rehearse
ci/rehearse/openshift/ocs-operator/master/ocs-operator-ci 8f8fbd3f0d3755c1bf443e058f1ba5db99faff4b link /test pj-rehearse
ci/rehearse/openshift/ocs-operator/master/red-hat-storage-ocs-ci-e2e-aws 8f8fbd3f0d3755c1bf443e058f1ba5db99faff4b link /test pj-rehearse

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@AlexNPavel
Copy link
Copy Markdown
Contributor Author

Rehearsal for the ocs-operator upgrade test now succeeds and seems to properly handle the upgrade. Relevent parts of the config for that test (the test will be removed from this PR as it was only initially included to rehearse the new workflow):

base_images:
  operator-index-48:
    name: redhat-operator-index
    namespace: ci
    tag: v4.8
operator:
  bundles:
  - as: ocs-bundle
    base_index: operator-index-48
    dockerfile_path: openshift-ci/Dockerfile.bundle
  substitutions:
  - pullspec: quay.io/ocs-dev/ocs-operator:latest
    with: ocs-operator
tests:
- as: ocs-operator-bundle-e2e-aws-upgrade
  steps:
    cluster_profile: aws
    dependencies:
      OO_INDEX: ci-index-ocs-bundle
    env:
      OO_CHANNEL: alpha
      OO_INITIAL_CHANNEL: stable-4.6
      OO_INITIAL_CSV: ocs-operator.v4.6.3
      OO_INSTALL_NAMESPACE: openshift-storage
      OO_LATEST_CSV: ocs-operator.v4.8.0
      OO_PACKAGE: ocs-operator
      OO_TARGET_NAMESPACES: '!install'
    test:
    - as: tests
      commands: |
        export GOFLAGS=''; make functest
      from: src
      resources:
        requests:
          cpu: 100m
          memory: 200Mi
    workflow: optional-operators-ci-aws-upgrade

Logs from subscribe step:

Error from server (NotFound): namespaces "openshift-storage" not found
OO_INSTALL_NAMESPACE is 'openshift-storage' which does not exist: creating
Installing "ocs-operator" in namespace "openshift-storage"
OO_TARGET_NAMESPACES is '!install': targeting operator installation namespace (openshift-storage)
OperatorGroup does not exist: creating it
OperatorGroup name is "oo-zv5hm"
Creating CatalogSource
CatalogSource name is "oo-lmzmb"
Creating Subscription
Subscription name is "oo-k7p7m"
Waiting for installPlan to be created
installplan.operators.coreos.com/install-sbzh7 patched
Install Plan approved
Waiting for ClusterServiceVersion to become ready...
ClusterServiceVersion "ocs-operator.v4.6.3" ready

Logs from upgrade step:

Set the deployment upgrade start time: 2021-03-26T22:15:06Z
subscription.operators.coreos.com/oo-k7p7m patched
Subscription channel updated and installPlan set to Automatic
Waiting for ClusterServiceVersion to become ready...
ClusterServiceVersion "ocs-operator.v4.8.0" ready
Saving deployment upgrade details in oo_deployment_upgrade_details.yaml as a shared artifact

The non-upgrade test still installed the latest operator directly in the subscribe test and passed as well.

This PR adds optional-operator upgrades workflows to the step registry.
@AlexNPavel AlexNPavel force-pushed the oo-upgrade-workflow branch from 8f8fbd3 to 4989a47 Compare March 26, 2021 22:42
@AlexNPavel
Copy link
Copy Markdown
Contributor Author

Temporary upgrade test for rehearsal has been removed and the commits have been squashed.

/retitle step-registry: add optional-operator upgrade workflows

@openshift-ci-robot openshift-ci-robot changed the title [WIP] step-registry: add optional-operator upgrade workflows step-registry: add optional-operator upgrade workflows Mar 26, 2021
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 26, 2021
Copy link
Copy Markdown
Member

@petr-muller petr-muller left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💯 🎉

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 29, 2021
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: AlexNPavel, petr-muller

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:

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

@openshift-merge-robot openshift-merge-robot merged commit 1a26415 into openshift:master Mar 29, 2021
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@AlexNPavel: Updated the step-registry configmap in namespace ci at cluster app.ci using the following files:

  • key OWNERS using file ci-operator/step-registry/optional-operators/ci/aws/upgrade/OWNERS
  • key optional-operators-ci-aws-upgrade-workflow.metadata.json using file ci-operator/step-registry/optional-operators/ci/aws/upgrade/optional-operators-ci-aws-upgrade-workflow.metadata.json
  • key optional-operators-ci-aws-upgrade-workflow.yaml using file ci-operator/step-registry/optional-operators/ci/aws/upgrade/optional-operators-ci-aws-upgrade-workflow.yaml
  • key OWNERS using file ci-operator/step-registry/optional-operators/ci/azure/upgrade/OWNERS
  • key optional-operators-ci-azure-upgrade-workflow.metadata.json using file ci-operator/step-registry/optional-operators/ci/azure/upgrade/optional-operators-ci-azure-upgrade-workflow.metadata.json
  • key optional-operators-ci-azure-upgrade-workflow.yaml using file ci-operator/step-registry/optional-operators/ci/azure/upgrade/optional-operators-ci-azure-upgrade-workflow.yaml
  • key OWNERS using file ci-operator/step-registry/optional-operators/ci/gcp/upgrade/OWNERS
  • key optional-operators-ci-gcp-upgrade-workflow.metadata.json using file ci-operator/step-registry/optional-operators/ci/gcp/upgrade/optional-operators-ci-gcp-upgrade-workflow.metadata.json
  • key optional-operators-ci-gcp-upgrade-workflow.yaml using file ci-operator/step-registry/optional-operators/ci/gcp/upgrade/optional-operators-ci-gcp-upgrade-workflow.yaml
  • key optional-operators-ci-subscribe-commands.sh using file ci-operator/step-registry/optional-operators/ci/subscribe/optional-operators-ci-subscribe-commands.sh
  • key optional-operators-ci-subscribe-ref.yaml using file ci-operator/step-registry/optional-operators/ci/subscribe/optional-operators-ci-subscribe-ref.yaml
  • key OWNERS using file ci-operator/step-registry/optional-operators/ci/upgrade/OWNERS
  • key optional-operators-ci-upgrade-commands.sh using file ci-operator/step-registry/optional-operators/ci/upgrade/optional-operators-ci-upgrade-commands.sh
  • key optional-operators-ci-upgrade-ref.metadata.json using file ci-operator/step-registry/optional-operators/ci/upgrade/optional-operators-ci-upgrade-ref.metadata.json
  • key optional-operators-ci-upgrade-ref.yaml using file ci-operator/step-registry/optional-operators/ci/upgrade/optional-operators-ci-upgrade-ref.yaml
Details

In response to this:

This PR adds optional-operator upgrades workflows to the step registry.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@AlexNPavel AlexNPavel deleted the oo-upgrade-workflow branch March 29, 2021 20:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants