Skip to content

Conversation

@petr-muller
Copy link
Member

@petr-muller petr-muller commented Aug 31, 2018

Matching PRs for ci-operator (openshift/ci-operator#121) and ci-operator-prowgen (openshift/ci-operator-prowgen#9) were merged. This change renames all *.json ci-operator configs to YAML, and adjusts all tools and documentations that reference *.json files. JSON is a YAML subset so all existing tooling should continue to work.

@openshift-ci-robot openshift-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Aug 31, 2018
@petr-muller
Copy link
Member Author

/cc @stevekuznetsov

@stevekuznetsov
Copy link
Contributor

Let's talk about this on Tuesday (or if you feel confident, do it Monday)

@bparees bparees removed their request for review August 31, 2018 18:15
@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Sep 6, 2018
@petr-muller petr-muller changed the title [WIP] Change ci-operator configuration format to YAML Rename ci-operator *.json configs to *.yaml Sep 6, 2018
@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 Sep 6, 2018
@petr-muller
Copy link
Member Author

To make processing and merge easier, I have removed the JSON-to-YAML reformatting commit from this PR.

@petr-muller
Copy link
Member Author

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 6, 2018
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 7, 2018
@openshift-bot openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 8, 2018
@openshift-bot openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 10, 2018
@bbguimaraes
Copy link
Contributor

To make processing and merge easier, I have removed the JSON-to-YAML reformatting commit from this PR.

@petr-muller: do you think the separation is necessary? I would rather do renaming + reformatting in one go, then communicate the change.

@petr-muller
Copy link
Member Author

@petr-muller: do you think the separation is necessary? I would rather do renaming + reformatting in one go, then communicate the change.

It was easier to keep mergeable. Plus the renaming is sensitive because of the references from ci-operator/jobs/.../*.yaml files and cluster/ci/config/prow/config.yaml. The formatting of the YAML itself does not matter that much and can be changed all at once, gradually or not at all, as we like.

@bbguimaraes
Copy link
Contributor

Rebase and let's do it!

@petr-muller
Copy link
Member Author

Rebased.

@bbguimaraes
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 10, 2018
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bbguimaraes, 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:
  • OWNERS [bbguimaraes,petr-muller]

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 72e5aaf into openshift:master Sep 10, 2018
@openshift-ci-robot
Copy link
Contributor

@petr-muller: Updated the following 2 configmaps:

  • job-config configmap using the following files:
    • key openshift-descheduler-presubmits-release-3.11.yaml using file ci-operator/jobs/openshift/descheduler/openshift-descheduler-presubmits-release-3.11.yaml
    • key openshift-service-serving-cert-signer-presubmits.yaml using file ci-operator/jobs/openshift/service-serving-cert-signer/openshift-service-serving-cert-signer-presubmits.yaml
    • key openshift-console-presubmits.yaml using file ci-operator/jobs/openshift/console/openshift-console-presubmits.yaml
    • key openshift-console-postsubmits.yaml using file ci-operator/jobs/openshift/console/openshift-console-postsubmits.yaml
    • key openshift-image-registry-presubmits-release-3.11.yaml using file ci-operator/jobs/openshift/image-registry/openshift-image-registry-presubmits-release-3.11.yaml
    • key openshift-origin-web-console-server-postsubmits-release-3.11.yaml using file ci-operator/jobs/openshift/origin-web-console-server/openshift-origin-web-console-server-postsubmits-release-3.11.yaml
    • key openshift-telemeter-postsubmits-release-3.11.yaml using file ci-operator/jobs/openshift/telemeter/openshift-telemeter-postsubmits-release-3.11.yaml
    • key openshift-cluster-version-operator-presubmits-release-3.11.yaml using file ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-presubmits-release-3.11.yaml
    • key openshift-installer-presubmits.yaml using file ci-operator/jobs/openshift/installer/openshift-installer-presubmits.yaml
    • key openshift-openshift-ansible-postsubmits-release-3.11.yaml using file ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-postsubmits-release-3.11.yaml
    • key openshift-telemeter-presubmits-release-3.11.yaml using file ci-operator/jobs/openshift/telemeter/openshift-telemeter-presubmits-release-3.11.yaml
    • key openshift-azure-misc-presubmits-release-3.11.yaml using file ci-operator/jobs/openshift/azure-misc/openshift-azure-misc-presubmits-release-3.11.yaml
    • key openshift-installer-postsubmits-release-3.11.yaml using file ci-operator/jobs/openshift/installer/openshift-installer-postsubmits-release-3.11.yaml
    • key openshift-origin-postsubmits-release-3.11.yaml using file ci-operator/jobs/openshift/origin/openshift-origin-postsubmits-release-3.11.yaml
    • key openshift-telemeter-presubmits.yaml using file ci-operator/jobs/openshift/telemeter/openshift-telemeter-presubmits.yaml
    • key openshift-cluster-version-operator-postsubmits.yaml using file ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-postsubmits.yaml
    • key openshift-origin-metrics-presubmits.yaml using file ci-operator/jobs/openshift/origin-metrics/openshift-origin-metrics-presubmits.yaml
    • key openshift-origin-web-console-server-postsubmits.yaml using file ci-operator/jobs/openshift/origin-web-console-server/openshift-origin-web-console-server-postsubmits.yaml
    • key openshift-azure-misc-postsubmits.yaml using file ci-operator/jobs/openshift/azure-misc/openshift-azure-misc-postsubmits.yaml
    • key openshift-coredns-presubmits.yaml using file ci-operator/jobs/openshift/coredns/openshift-coredns-presubmits.yaml
    • key openshift-kubernetes-autoscaler-postsubmits-release-3.11.yaml using file ci-operator/jobs/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-postsubmits-release-3.11.yaml
    • key openshift-origin-metrics-postsubmits-release-3.11.yaml using file ci-operator/jobs/openshift/origin-metrics/openshift-origin-metrics-postsubmits-release-3.11.yaml
    • key openshift-cluster-capacity-postsubmits-release-3.11.yaml using file ci-operator/jobs/openshift/cluster-capacity/openshift-cluster-capacity-postsubmits-release-3.11.yaml
    • key openshift-openshift-ansible-presubmits-release-3.11.yaml using file ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-presubmits-release-3.11.yaml
    • key openshift-descheduler-presubmits.yaml using file ci-operator/jobs/openshift/descheduler/openshift-descheduler-presubmits.yaml
    • key openshift-cluster-api-provider-aws-presubmits-release-3.11.yaml using file ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-presubmits-release-3.11.yaml
    • key openshift-cluster-operator-presubmits.yaml using file ci-operator/jobs/openshift/cluster-operator/openshift-cluster-operator-presubmits.yaml
    • key openshift-jenkins-presubmits.yaml using file ci-operator/jobs/openshift/jenkins/openshift-jenkins-presubmits.yaml
    • key openshift-openshift-azure-presubmits.yaml using file ci-operator/jobs/openshift/openshift-azure/openshift-openshift-azure-presubmits.yaml
    • key openshift-origin-postsubmits.yaml using file ci-operator/jobs/openshift/origin/openshift-origin-postsubmits.yaml
    • key tnozicka-openshift-acme-postsubmits.yaml using file ci-operator/jobs/tnozicka/openshift-acme/tnozicka-openshift-acme-postsubmits.yaml
    • key openshift-cluster-api-provider-aws-postsubmits-release-3.11.yaml using file ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-postsubmits-release-3.11.yaml
    • key openshift-coredns-postsubmits-release-3.11.yaml using file ci-operator/jobs/openshift/coredns/openshift-coredns-postsubmits-release-3.11.yaml
    • key openshift-kubernetes-autoscaler-presubmits.yaml using file ci-operator/jobs/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-presubmits.yaml
    • key openshift-kubernetes-metrics-server-postsubmits.yaml using file ci-operator/jobs/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-postsubmits.yaml
    • key openshift-origin-web-console-server-presubmits-release-3.11.yaml using file ci-operator/jobs/openshift/origin-web-console-server/openshift-origin-web-console-server-presubmits-release-3.11.yaml
    • key openshift-cluster-monitoring-operator-postsubmits-release-3.11.yaml using file ci-operator/jobs/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-postsubmits-release-3.11.yaml
    • key openshift-cluster-version-operator-postsubmits-release-3.11.yaml using file ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-postsubmits-release-3.11.yaml
    • key openshift-cluster-api-provider-libvirt-presubmits-release-3.11.yaml using file ci-operator/jobs/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-presubmits-release-3.11.yaml
    • key openshift-descheduler-postsubmits.yaml using file ci-operator/jobs/openshift/descheduler/openshift-descheduler-postsubmits.yaml
    • key openshift-kubernetes-autoscaler-presubmits-release-3.11.yaml using file ci-operator/jobs/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-presubmits-release-3.11.yaml
    • key openshift-machine-config-operator-postsubmits.yaml using file ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-postsubmits.yaml
    • key openshift-ci-operator-presubmits.yaml using file ci-operator/jobs/openshift/ci-operator/openshift-ci-operator-presubmits.yaml
    • key openshift-origin-periodics.yaml using file ci-operator/jobs/openshift/origin/openshift-origin-periodics.yaml
    • key openshift-origin-aggregated-logging-presubmits.yaml using file ci-operator/jobs/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-presubmits.yaml
    • key openshift-kube-rbac-proxy-postsubmits.yaml using file ci-operator/jobs/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-postsubmits.yaml
    • key openshift-machine-api-operator-presubmits-release-3.11.yaml using file ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-presubmits-release-3.11.yaml
    • key openshift-telemeter-postsubmits.yaml using file ci-operator/jobs/openshift/telemeter/openshift-telemeter-postsubmits.yaml
    • key openshift-cluster-dns-operator-presubmits.yaml using file ci-operator/jobs/openshift/cluster-dns-operator/openshift-cluster-dns-operator-presubmits.yaml
    • key openshift-origin-web-console-server-presubmits.yaml using file ci-operator/jobs/openshift/origin-web-console-server/openshift-origin-web-console-server-presubmits.yaml
    • key openshift-origin-presubmits.yaml using file ci-operator/jobs/openshift/origin/openshift-origin-presubmits.yaml
    • key openshift-installer-presubmits-release-3.11.yaml using file ci-operator/jobs/openshift/installer/openshift-installer-presubmits-release-3.11.yaml
    • key openshift-imagebuilder-presubmits.yaml using file ci-operator/jobs/openshift/imagebuilder/openshift-imagebuilder-presubmits.yaml
    • key openshift-kubernetes-metrics-server-presubmits-release-3.11.yaml using file ci-operator/jobs/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-presubmits-release-3.11.yaml
    • key openshift-service-serving-cert-signer-postsubmits.yaml using file ci-operator/jobs/openshift/service-serving-cert-signer/openshift-service-serving-cert-signer-postsubmits.yaml
    • key openshift-ci-operator-prowgen-presubmits.yaml using file ci-operator/jobs/openshift/ci-operator-prowgen/openshift-ci-operator-prowgen-presubmits.yaml
    • key openshift-origin-aggregated-logging-postsubmits.yaml using file ci-operator/jobs/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-postsubmits.yaml
    • key openshift-ci-operator-postsubmits.yaml using file ci-operator/jobs/openshift/ci-operator/openshift-ci-operator-postsubmits.yaml
    • key openshift-installer-postsubmits.yaml using file ci-operator/jobs/openshift/installer/openshift-installer-postsubmits.yaml
    • key openshift-kube-state-metrics-postsubmits.yaml using file ci-operator/jobs/openshift/kube-state-metrics/openshift-kube-state-metrics-postsubmits.yaml
    • key openshift-origin-aggregated-logging-postsubmits-release-3.11.yaml using file ci-operator/jobs/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-postsubmits-release-3.11.yaml
    • key openshift-cluster-api-provider-libvirt-presubmits.yaml using file ci-operator/jobs/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-presubmits.yaml
    • key openshift-kubernetes-metrics-server-presubmits.yaml using file ci-operator/jobs/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-presubmits.yaml
    • key openshift-origin-metrics-postsubmits.yaml using file ci-operator/jobs/openshift/origin-metrics/openshift-origin-metrics-postsubmits.yaml
    • key openshift-origin-metrics-presubmits-release-3.11.yaml using file ci-operator/jobs/openshift/origin-metrics/openshift-origin-metrics-presubmits-release-3.11.yaml
    • key openshift-cluster-api-provider-aws-presubmits.yaml using file ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-presubmits.yaml
    • key openshift-cluster-samples-operator-presubmits.yaml using file ci-operator/jobs/openshift/cluster-samples-operator/openshift-cluster-samples-operator-presubmits.yaml
    • key openshift-configmap-reload-postsubmits.yaml using file ci-operator/jobs/openshift/configmap-reload/openshift-configmap-reload-postsubmits.yaml
    • key openshift-cluster-version-operator-presubmits.yaml using file ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-presubmits.yaml
    • key openshift-openshift-ansible-postsubmits.yaml using file ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-postsubmits.yaml
    • key openshift-origin-aggregated-logging-presubmits-release-3.11.yaml using file ci-operator/jobs/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-presubmits-release-3.11.yaml
    • key openshift-image-registry-presubmits.yaml using file ci-operator/jobs/openshift/image-registry/openshift-image-registry-presubmits.yaml
    • key openshift-descheduler-postsubmits-release-3.11.yaml using file ci-operator/jobs/openshift/descheduler/openshift-descheduler-postsubmits-release-3.11.yaml
    • key openshift-origin-presubmits-release-3.11.yaml using file ci-operator/jobs/openshift/origin/openshift-origin-presubmits-release-3.11.yaml
    • key openshift-cluster-api-provider-aws-postsubmits.yaml using file ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-postsubmits.yaml
    • key openshift-openshift-ansible-presubmits.yaml using file ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-presubmits.yaml
    • key openshift-kubernetes-metrics-server-postsubmits-release-3.11.yaml using file ci-operator/jobs/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-postsubmits-release-3.11.yaml
    • key openshift-api-presubmits.yaml using file ci-operator/jobs/openshift/api/openshift-api-presubmits.yaml
    • key openshift-coredns-postsubmits.yaml using file ci-operator/jobs/openshift/coredns/openshift-coredns-postsubmits.yaml
    • key openshift-machine-api-operator-postsubmits.yaml using file ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-postsubmits.yaml
    • key openshift-cluster-ingress-operator-postsubmits.yaml using file ci-operator/jobs/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-postsubmits.yaml
    • key openshift-coredns-presubmits-release-3.11.yaml using file ci-operator/jobs/openshift/coredns/openshift-coredns-presubmits-release-3.11.yaml
    • key openshift-machine-api-operator-postsubmits-release-3.11.yaml using file ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-postsubmits-release-3.11.yaml
    • key openshift-machine-config-operator-presubmits-release-3.11.yaml using file ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-presubmits-release-3.11.yaml
    • key openshift-openshift-azure-postsubmits.yaml using file ci-operator/jobs/openshift/openshift-azure/openshift-openshift-azure-postsubmits.yaml
    • key openshift-azure-misc-presubmits.yaml using file ci-operator/jobs/openshift/azure-misc/openshift-azure-misc-presubmits.yaml
    • key openshift-machine-config-operator-postsubmits-release-3.11.yaml using file ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-postsubmits-release-3.11.yaml
    • key openshift-cluster-dns-operator-postsubmits.yaml using file ci-operator/jobs/openshift/cluster-dns-operator/openshift-cluster-dns-operator-postsubmits.yaml
    • key openshift-cluster-operator-postsubmits.yaml using file ci-operator/jobs/openshift/cluster-operator/openshift-cluster-operator-postsubmits.yaml
    • key openshift-console-postsubmits-release-3.11.yaml using file ci-operator/jobs/openshift/console/openshift-console-postsubmits-release-3.11.yaml
    • key openshift-image-registry-postsubmits-release-3.11.yaml using file ci-operator/jobs/openshift/image-registry/openshift-image-registry-postsubmits-release-3.11.yaml
    • key openshift-cluster-ingress-operator-presubmits.yaml using file ci-operator/jobs/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-presubmits.yaml
    • key openshift-machine-api-operator-presubmits.yaml using file ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-presubmits.yaml
    • key openshift-prometheus-operator-postsubmits.yaml using file ci-operator/jobs/openshift/prometheus-operator/openshift-prometheus-operator-postsubmits.yaml
    • key openshift-cluster-capacity-presubmits.yaml using file ci-operator/jobs/openshift/cluster-capacity/openshift-cluster-capacity-presubmits.yaml
    • key openshift-service-catalog-postsubmits.yaml using file ci-operator/jobs/openshift/service-catalog/openshift-service-catalog-postsubmits.yaml
    • key openshift-service-catalog-presubmits-release-3.11.yaml using file ci-operator/jobs/openshift/service-catalog/openshift-service-catalog-presubmits-release-3.11.yaml
    • key openshift-service-catalog-presubmits.yaml using file ci-operator/jobs/openshift/service-catalog/openshift-service-catalog-presubmits.yaml
    • key openshift-service-serving-cert-signer-postsubmits-release-3.11.yaml using file ci-operator/jobs/openshift/service-serving-cert-signer/openshift-service-serving-cert-signer-postsubmits-release-3.11.yaml
    • key tnozicka-openshift-acme-presubmits.yaml using file ci-operator/jobs/tnozicka/openshift-acme/tnozicka-openshift-acme-presubmits.yaml
    • key openshift-machine-config-operator-presubmits.yaml using file ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-presubmits.yaml
    • key openshift-ci-operator-prowgen-postsubmits.yaml using file ci-operator/jobs/openshift/ci-operator-prowgen/openshift-ci-operator-prowgen-postsubmits.yaml
    • key openshift-cluster-capacity-postsubmits.yaml using file ci-operator/jobs/openshift/cluster-capacity/openshift-cluster-capacity-postsubmits.yaml
    • key openshift-cluster-capacity-presubmits-release-3.11.yaml using file ci-operator/jobs/openshift/cluster-capacity/openshift-cluster-capacity-presubmits-release-3.11.yaml
    • key openshift-cluster-monitoring-operator-postsubmits.yaml using file ci-operator/jobs/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-postsubmits.yaml
    • key openshift-console-presubmits-release-3.11.yaml using file ci-operator/jobs/openshift/console/openshift-console-presubmits-release-3.11.yaml
    • key openshift-image-registry-postsubmits.yaml using file ci-operator/jobs/openshift/image-registry/openshift-image-registry-postsubmits.yaml
    • key openshift-kubernetes-autoscaler-postsubmits.yaml using file ci-operator/jobs/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-postsubmits.yaml
    • key openshift-azure-misc-postsubmits-release-3.11.yaml using file ci-operator/jobs/openshift/azure-misc/openshift-azure-misc-postsubmits-release-3.11.yaml
    • key openshift-service-serving-cert-signer-presubmits-release-3.11.yaml using file ci-operator/jobs/openshift/service-serving-cert-signer/openshift-service-serving-cert-signer-presubmits-release-3.11.yaml
    • key manual-presubmits.yaml using file ci-operator/jobs/tnozicka/openshift-acme/manual-presubmits.yaml
    • key openshift-service-catalog-postsubmits-release-3.11.yaml using file ci-operator/jobs/openshift/service-catalog/openshift-service-catalog-postsubmits-release-3.11.yaml
  • plugins configmap using the following files:
    • key plugins.yaml using file cluster/ci/config/prow/plugins.yaml
Details

In response to this:

Matching PRs for ci-operator (openshift/ci-operator#121) and ci-operator-prowgen (openshift/ci-operator-prowgen#9) were merged. This change renames all *.json ci-operator configs to YAML, and adjusts all tools and documentations that reference *.json files. JSON is a YAML subset so all existing tooling should continue to work.

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.

@petr-muller
Copy link
Member Author

🤞

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.

6 participants