Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ci-operator config and job for cri-o #3962

Merged
merged 1 commit into from
Jun 18, 2019
Merged

Add ci-operator config and job for cri-o #3962

merged 1 commit into from
Jun 18, 2019

Conversation

umohnani8
Copy link
Contributor

Add yaml files to config and jobs for cri-o release-1.13
branch so that we can trigger the e2e-aws tests on cri-o
PRs.

Signed-off-by: Urvashi Mohnani [email protected]

@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jun 5, 2019
@umohnani8
Copy link
Contributor Author

@mrunalp @smarterclayton PTAL

@@ -0,0 +1,42 @@
postsubmits:
Copy link
Contributor

Choose a reason for hiding this comment

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

You shouldn't need this, remove the promotion config from your job (remove promotion:) and then regen and it should go away.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I removed promotion: from the config yaml and regenerated, but the postsubmits did not go away.

Copy link
Contributor

Choose a reason for hiding this comment

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

delete the new files under ci-operator/jobs/* that got created, then run regenerate

Copy link
Contributor Author

Choose a reason for hiding this comment

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

got it, thanks! done

openshift_installer:
cluster_profile: aws
upgrade: false
- as: launch-aws
Copy link
Contributor

Choose a reason for hiding this comment

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

you'll need to make this an optional job (after generating) by adding the correct "optional" attributes in presubmits.yaml. See what origin launch-aws does. (required: false, optional: true, I think)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@umohnani8
Copy link
Contributor Author

Waiting cri-o/cri-o#2449 to get in for the rehearse tests here to pass

@umohnani8
Copy link
Contributor Author

/retest

@umohnani8
Copy link
Contributor Author

/test pj-rehearse

@@ -0,0 +1,64 @@
base_images:
base:
name: "4.1"
Copy link
Contributor

Choose a reason for hiding this comment

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

4.2?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is for cri-o 1.13, so that should be for 4.1. cri-o 1.14 will be for 4.2.

@umohnani8
Copy link
Contributor Author

@smarterclayton the e2e-aws test suite is failing on 2 prometheus tests https://openshift-gce-devel.appspot.com/build/origin-ci-test/pr-logs/pull/openshift_release/3962/rehearse-3962-pull-ci-cri-o-cri-o-release-1.13-e2e-aws/7.
From one of the tests at https://github.com/openshift/origin/blob/master/test/extended/prometheus/prometheus_builds.go#L120, I see that is not getting the "success" results it needs to pass.
What exactly are the prometheus tests looking for? I am not sure about what it is not getting from cri-o. Metrics are enabled in cri-o and the port is set to 9537.

@petr-muller
Copy link
Member

@stevekunetsov ouch, the release-1.13 branch is conflicting with the openshift branching scheme...

@smarterclayton
Copy link
Contributor

@adambkaplan do you know why these would fail?

@adambkaplan
Copy link
Contributor

@smarterclayton no idea - that method is shared between the normal prometheus tests and the build metrics test.

@brancz can you shed some light here?

@brancz
Copy link
Contributor

brancz commented Jun 12, 2019

The failure is that there is an alert firing, that shouldn't be firing, and missing the crio job.

The discovery for crio is configured here: https://github.com/openshift/cluster-monitoring-operator/blob/5092b55844dfec03d61f0c767f01da887e95f40c/assets/prometheus-k8s/service-monitor-kubelet.yaml#L32-L48

I'm downloading the Prometheus dump to understand more.

@brancz
Copy link
Contributor

brancz commented Jun 12, 2019

Yep looks like it's not a discovery problem, but it really can't be scraped for some reason, so the failed CI is legit:

Screenshot from 2019-06-12 14-17-45

@umohnani8
Copy link
Contributor Author

/test pj-rehearse

3 similar comments
@umohnani8
Copy link
Contributor Author

/test pj-rehearse

@umohnani8
Copy link
Contributor Author

/test pj-rehearse

@umohnani8
Copy link
Contributor Author

/test pj-rehearse

Add yaml files to config and jobs for cri-o release-1.13
branch so that we can trigger the e2e-aws tests on cri-o
PRs.

Signed-off-by: Urvashi Mohnani <[email protected]>
@umohnani8
Copy link
Contributor Author

Tests are green! The sharded-config test error is saying

You are adding a file that is not covered by the automatic upload.
[ERROR] Contact an administrator to resolve this issue.

@smarterclayton what do I need to do to make this pass?

@petr-muller
Copy link
Member

petr-muller commented Jun 18, 2019

Tests are green! The sharded-config test error is saying
...
what do I need to do to make this pass?

@umohnani8 Some of your config files are not covered by the config-updater config here, meaning they wouldn't be automatically uploaded to the cluster. You need to add regexes covering your configs there, for both ci-operator/config/... and ci-operator/jobs/... paths.

...-misc configmaps look like a proper destination for these, like job CM here and ci-op CM here

Important: The config-updater config change needs to be merged in a separate PR first

@umohnani8
Copy link
Contributor Author

@petr-muller got it, thanks! Opened #4082 for the config-updater.

@umohnani8
Copy link
Contributor Author

/test correctly-sharded-config

@umohnani8
Copy link
Contributor Author

@petr-muller all tests are green now :)

Copy link
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.

/lgtm
/approve

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 18, 2019
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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

The pull request process is described here

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-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 18, 2019
@openshift-merge-robot openshift-merge-robot merged commit b57378f into openshift:master Jun 18, 2019
@openshift-ci-robot
Copy link
Contributor

@umohnani8: Updated the following 3 configmaps:

  • job-config-misc configmap in namespace ci using the following files:
    • key cri-o-cri-o-release-1.13-presubmits.yaml using file ci-operator/jobs/cri-o/cri-o/cri-o-cri-o-release-1.13-presubmits.yaml
  • ci-operator-misc-configs configmap in namespace ci using the following files:
    • key cri-o-cri-o-release-1.13.yaml using file ci-operator/config/cri-o/cri-o/cri-o-cri-o-release-1.13.yaml
  • ci-operator-misc-configs configmap in namespace ci-stg using the following files:
    • key cri-o-cri-o-release-1.13.yaml using file ci-operator/config/cri-o/cri-o/cri-o-cri-o-release-1.13.yaml

In response to this:

Add yaml files to config and jobs for cri-o release-1.13
branch so that we can trigger the e2e-aws tests on cri-o
PRs.

Signed-off-by: Urvashi Mohnani [email protected]

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.

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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants