Skip to content

USHIFT-4268: Don't fail if .extra_refs or .refs are missing#56678

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:masterfrom
pmtk:drop-src-fix
Sep 13, 2024
Merged

USHIFT-4268: Don't fail if .extra_refs or .refs are missing#56678
openshift-merge-bot[bot] merged 1 commit intoopenshift:masterfrom
pmtk:drop-src-fix

Conversation

@pmtk
Copy link
Member

@pmtk pmtk commented Sep 13, 2024

No description provided.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 13, 2024
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Sep 13, 2024

@pmtk: This pull request references USHIFT-4268 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.18.0" version, but no target version was set.

Details

In response to this:

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 13, 2024
@pmtk
Copy link
Member Author

pmtk commented Sep 13, 2024

$ JOB_SPEC='{"type":"presubmit","job":"pull-ci-openshift-microshift-release-4.17-metal-bootc-test","buildid":"1834467438985482240","prowjobid":"3b906cf6-93e2-496b-8189-f30f9eb59c16","refs":{"org":"openshift","repo":"microshift","repo_link":"https://github.com/openshift/microshift","base_ref":"release-4.17","base_sha":"681c02a9374331775aaf342f0e9a8c5d52afd334","base_link":"https://github.com/openshift/microshift/commit/681c02a9374331775aaf342f0e9a8c5d52afd334","pulls":[{"number":3920,"author":"ggiguash","sha":"97e4633df7ea5a3e761e04ff607075dd1d893280","title":"[release-4.17] USHIFT-4338: Declare openvswitch3.3 package as obsolete to allow seemless upgrade to openvswitch3.4","head_ref":"fix_rpm_spec","link":"https://github.com/openshift/microshift/pull/3920","commit_link":"https://github.com/openshift/microshift/pull/3920/commits/97e4633df7ea5a3e761e04ff607075dd1d893280","author_link":"https://github.com/ggiguash"}]},"decoration_config":{"timeout":"2h0m0s","grace_period":"10m0s","utility_images":{"clonerefs":"us-docker.pkg.dev/k8s-infra-prow/images/clonerefs:v20240911-5886b0452","initupload":"us-docker.pkg.dev/k8s-infra-prow/images/initupload:v20240911-5886b0452","entrypoint":"us-docker.pkg.dev/k8s-infra-prow/images/entrypoint:v20240911-5886b0452","sidecar":"us-docker.pkg.dev/k8s-infra-prow/images/sidecar:v20240911-5886b0452"},"resources":{"clonerefs":{"limits":{"memory":"3Gi"},"requests":{"cpu":"100m","memory":"500Mi"}},"initupload":{"limits":{"memory":"200Mi"},"requests":{"cpu":"100m","memory":"50Mi"}},"place_entrypoint":{"limits":{"memory":"100Mi"},"requests":{"cpu":"100m","memory":"25Mi"}},"sidecar":{"limits":{"memory":"2Gi"},"requests":{"cpu":"100m","memory":"250Mi"}}},"gcs_configuration":{"bucket":"test-platform-results","path_strategy":"single","default_org":"openshift","default_repo":"origin","mediaTypes":{"log":"text/plain"},"compress_file_types":["txt","log","json","tar","html","yaml"]},"gcs_credentials_secret":"gce-sa-credentials-gcs-publisher","skip_cloning":true,"censor_secrets":true}}'



$ echo $JOB_SPEC | jq '{"src_root": "/go", "log":"/dev/null", "git_user_name": "ci-robot", "git_user_email": "ci-robot@openshift.io", "fail": true, "refs": [.refs, .extra_refs[]]}'
jq: error (at <stdin>:1): Cannot iterate over null (null)


$ echo $JOB_SPEC | jq '{"src_root": "/go", "log":"/dev/null", "git_user_name": "ci-robot", "git_user_email": "ci-robot@openshift.io", "fail": true, "refs": [.refs, try(.extra_refs[])]}'
{
  "src_root": "/go",
  "log": "/dev/null",
  "git_user_name": "ci-robot",
  "git_user_email": "ci-robot@openshift.io",
  "fail": true,
  "refs": [
    {
      "org": "openshift",
      "repo": "microshift",
      "repo_link": "https://github.com/openshift/microshift",
      "base_ref": "release-4.17",
      "base_sha": "681c02a9374331775aaf342f0e9a8c5d52afd334",
      "base_link": "https://github.com/openshift/microshift/commit/681c02a9374331775aaf342f0e9a8c5d52afd334",
      "pulls": [
        {
          "number": 3920,
          "author": "ggiguash",
          "sha": "97e4633df7ea5a3e761e04ff607075dd1d893280",
          "title": "[release-4.17] USHIFT-4338: Declare openvswitch3.3 package as obsolete to allow seemless upgrade to openvswitch3.4",
          "head_ref": "fix_rpm_spec",
          "link": "https://github.com/openshift/microshift/pull/3920",
          "commit_link": "https://github.com/openshift/microshift/pull/3920/commits/97e4633df7ea5a3e761e04ff607075dd1d893280",
          "author_link": "https://github.com/ggiguash"
        }
      ]
    }
  ]
}

@pmtk
Copy link
Member Author

pmtk commented Sep 13, 2024

/pj-rehearse ack

@openshift-ci-robot
Copy link
Contributor

@pmtk: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-ci-robot openshift-ci-robot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Sep 13, 2024
@pmtk
Copy link
Member Author

pmtk commented Sep 13, 2024

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 13, 2024
Copy link
Contributor

@pacevedom pacevedom left a comment

Choose a reason for hiding this comment

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

/lgtm

@pmtk pmtk changed the title USHIFT-4268: Don't fail if .extra_refs is missing USHIFT-4268: Don't fail if .extra_refs or .refs are missing Sep 13, 2024
@pacevedom
Copy link
Contributor

/lgtm

@pmtk
Copy link
Member Author

pmtk commented Sep 13, 2024

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 13, 2024
@openshift-ci-robot openshift-ci-robot removed the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Sep 13, 2024
@openshift-ci-robot
Copy link
Contributor

[REHEARSALNOTIFIER]
@pmtk: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
pull-ci-openshift-origin-master-e2e-aws-ovn-microshift openshift/origin presubmit Registry content changed
pull-ci-openshift-origin-master-e2e-aws-ovn-microshift-serial openshift/origin presubmit Registry content changed
pull-ci-openshift-origin-release-4.19-e2e-aws-ovn-microshift openshift/origin presubmit Registry content changed
pull-ci-openshift-origin-release-4.19-e2e-aws-ovn-microshift-serial openshift/origin presubmit Registry content changed
pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-microshift openshift/origin presubmit Registry content changed
pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-microshift-serial openshift/origin presubmit Registry content changed
pull-ci-openshift-microshift-main-footprint-and-performance openshift/microshift presubmit Registry content changed
pull-ci-openshift-microshift-release-4.19-footprint-and-performance openshift/microshift presubmit Registry content changed
pull-ci-openshift-microshift-release-4.18-footprint-and-performance openshift/microshift presubmit Registry content changed
pull-ci-openshift-microshift-release-4.17-footprint-and-performance openshift/microshift presubmit Registry content changed
pull-ci-openshift-microshift-main-microshift-metal-cache openshift/microshift presubmit Registry content changed
pull-ci-openshift-microshift-main-microshift-metal-cache-arm openshift/microshift presubmit Registry content changed
pull-ci-openshift-microshift-release-4.19-microshift-metal-cache openshift/microshift presubmit Registry content changed
pull-ci-openshift-microshift-release-4.19-microshift-metal-cache-arm openshift/microshift presubmit Registry content changed
pull-ci-openshift-microshift-release-4.18-microshift-metal-cache openshift/microshift presubmit Registry content changed
pull-ci-openshift-microshift-release-4.18-microshift-metal-cache-arm openshift/microshift presubmit Registry content changed
pull-ci-openshift-microshift-release-4.17-microshift-metal-cache openshift/microshift presubmit Registry content changed
pull-ci-openshift-microshift-release-4.17-microshift-metal-cache-arm openshift/microshift presubmit Registry content changed
pull-ci-openshift-microshift-main-microshift-metal-tests openshift/microshift presubmit Registry content changed
pull-ci-openshift-microshift-main-microshift-metal-tests-arm openshift/microshift presubmit Registry content changed
pull-ci-openshift-microshift-main-metal-periodic-test openshift/microshift presubmit Registry content changed
pull-ci-openshift-microshift-main-metal-periodic-test-arm openshift/microshift presubmit Registry content changed
pull-ci-openshift-microshift-main-metal-bootc-test openshift/microshift presubmit Registry content changed
pull-ci-openshift-microshift-main-metal-bootc-test-arm openshift/microshift presubmit Registry content changed
pull-ci-openshift-microshift-main-metal-bootc-periodic-test openshift/microshift presubmit Registry content changed

A total of 123 jobs have been affected by this change. The above listing is non-exhaustive and limited to 25 jobs.

A full list of affected jobs can be found here

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse abort to abort all active rehearsals

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@pmtk
Copy link
Member Author

pmtk commented Sep 13, 2024

JS_FULL='{"type":"presubmit","job":"rehearse-56279-pull-ci-openshift-microshift-release-4.17-metal-bootc-periodic-test","buildid":"1834178155145859072","prowjobid":"b4ddcd58-baf9-423f-b004-f93512c31336","refs":{"org":"openshift","repo":"release","base_ref":"master","base_sha":"b2878eae066f34139ad1d8a53c9a946d485ab0b8","pulls":[{"number":56279,"author":"pmtk","sha":"8d18e4bb6f4ae446514bec755e638f0420d55258","title":"USHIFT-4268: Drop `src` from microshift jobs","link":"https://github.com/openshift/release/pull/56279"}]},"extra_refs":[{"org":"openshift","repo":"microshift","base_ref":"release-4.17","workdir":true}],"decoration_config":{"timeout":"2h0m0s","grace_period":"10m0s","utility_images":{"clonerefs":"us-docker.pkg.dev/k8s-infra-prow/images/clonerefs:v20240911-5886b0452","initupload":"us-docker.pkg.dev/k8s-infra-prow/images/initupload:v20240911-5886b0452","entrypoint":"us-docker.pkg.dev/k8s-infra-prow/images/entrypoint:v20240911-5886b0452","sidecar":"us-docker.pkg.dev/k8s-infra-prow/images/sidecar:v20240911-5886b0452"},"resources":{"clonerefs":{"limits":{"memory":"3Gi"},"requests":{"cpu":"100m","memory":"500Mi"}},"initupload":{"limits":{"memory":"200Mi"},"requests":{"cpu":"100m","memory":"50Mi"}},"place_entrypoint":{"limits":{"memory":"100Mi"},"requests":{"cpu":"100m","memory":"25Mi"}},"sidecar":{"limits":{"memory":"2Gi"},"requests":{"cpu":"100m","memory":"250Mi"}}},"gcs_configuration":{"bucket":"test-platform-results","path_strategy":"single","default_org":"openshift","default_repo":"origin","mediaTypes":{"log":"text/plain"},"job_url_prefix":"https://prow.ci.openshift.org/view/","compress_file_types":["txt","log","json","tar","html","yaml"]},"gcs_credentials_secret":"gce-sa-credentials-gcs-publisher","skip_cloning":true,"censor_secrets":true}}'
JS_NO_REFS='{"type":"presubmit","job":"rehearse-56279-pull-ci-openshift-microshift-release-4.17-metal-bootc-periodic-test","buildid":"1834178155145859072","prowjobid":"b4ddcd58-baf9-423f-b004-f93512c31336","extra_refs":[{"org":"openshift","repo":"microshift","base_ref":"release-4.17","workdir":true}],"decoration_config":{"timeout":"2h0m0s","grace_period":"10m0s","utility_images":{"clonerefs":"us-docker.pkg.dev/k8s-infra-prow/images/clonerefs:v20240911-5886b0452","initupload":"us-docker.pkg.dev/k8s-infra-prow/images/initupload:v20240911-5886b0452","entrypoint":"us-docker.pkg.dev/k8s-infra-prow/images/entrypoint:v20240911-5886b0452","sidecar":"us-docker.pkg.dev/k8s-infra-prow/images/sidecar:v20240911-5886b0452"},"resources":{"clonerefs":{"limits":{"memory":"3Gi"},"requests":{"cpu":"100m","memory":"500Mi"}},"initupload":{"limits":{"memory":"200Mi"},"requests":{"cpu":"100m","memory":"50Mi"}},"place_entrypoint":{"limits":{"memory":"100Mi"},"requests":{"cpu":"100m","memory":"25Mi"}},"sidecar":{"limits":{"memory":"2Gi"},"requests":{"cpu":"100m","memory":"250Mi"}}},"gcs_configuration":{"bucket":"test-platform-results","path_strategy":"single","default_org":"openshift","default_repo":"origin","mediaTypes":{"log":"text/plain"},"job_url_prefix":"https://prow.ci.openshift.org/view/","compress_file_types":["txt","log","json","tar","html","yaml"]},"gcs_credentials_secret":"gce-sa-credentials-gcs-publisher","skip_cloning":true,"censor_secrets":true}}'
JS_NO_EXTRA_REFS='{"type":"presubmit","job":"rehearse-56279-pull-ci-openshift-microshift-release-4.17-metal-bootc-periodic-test","buildid":"1834178155145859072","prowjobid":"b4ddcd58-baf9-423f-b004-f93512c31336","refs":{"org":"openshift","repo":"release","base_ref":"master","base_sha":"b2878eae066f34139ad1d8a53c9a946d485ab0b8","pulls":[{"number":56279,"author":"pmtk","sha":"8d18e4bb6f4ae446514bec755e638f0420d55258","title":"USHIFT-4268: Drop `src` from microshift jobs","link":"https://github.com/openshift/release/pull/56279"}]},"decoration_config":{"timeout":"2h0m0s","grace_period":"10m0s","utility_images":{"clonerefs":"us-docker.pkg.dev/k8s-infra-prow/images/clonerefs:v20240911-5886b0452","initupload":"us-docker.pkg.dev/k8s-infra-prow/images/initupload:v20240911-5886b0452","entrypoint":"us-docker.pkg.dev/k8s-infra-prow/images/entrypoint:v20240911-5886b0452","sidecar":"us-docker.pkg.dev/k8s-infra-prow/images/sidecar:v20240911-5886b0452"},"resources":{"clonerefs":{"limits":{"memory":"3Gi"},"requests":{"cpu":"100m","memory":"500Mi"}},"initupload":{"limits":{"memory":"200Mi"},"requests":{"cpu":"100m","memory":"50Mi"}},"place_entrypoint":{"limits":{"memory":"100Mi"},"requests":{"cpu":"100m","memory":"25Mi"}},"sidecar":{"limits":{"memory":"2Gi"},"requests":{"cpu":"100m","memory":"250Mi"}}},"gcs_configuration":{"bucket":"test-platform-results","path_strategy":"single","default_org":"openshift","default_repo":"origin","mediaTypes":{"log":"text/plain"},"job_url_prefix":"https://prow.ci.openshift.org/view/","compress_file_types":["txt","log","json","tar","html","yaml"]},"gcs_credentials_secret":"gce-sa-credentials-gcs-publisher","skip_cloning":true,"censor_secrets":true}}'


$ echo $JS_FULL | jq '{"src_root": "/go", "log":"/dev/null", "git_user_name": "ci-robot", "git_user_email": "ci-robot@openshift.io", "fail": true, "refs": [ (select(.refs) | .refs)  , try(.extra_refs[])]}'
{
  "src_root": "/go",
  "log": "/dev/null",
  "git_user_name": "ci-robot",
  "git_user_email": "ci-robot@openshift.io",
  "fail": true,
  "refs": [
    {
      "org": "openshift",
      "repo": "release",
      "base_ref": "master",
      "base_sha": "b2878eae066f34139ad1d8a53c9a946d485ab0b8",
      "pulls": [
        {
          "number": 56279,
          "author": "pmtk",
          "sha": "8d18e4bb6f4ae446514bec755e638f0420d55258",
          "title": "USHIFT-4268: Drop `src` from microshift jobs",
          "link": "https://github.com/openshift/release/pull/56279"
        }
      ]
    },
    {
      "org": "openshift",
      "repo": "microshift",
      "base_ref": "release-4.17",
      "workdir": true
    }
  ]
}

$ echo $JS_NO_REFS | jq '{"src_root": "/go", "log":"/dev/null", "git_user_name": "ci-robot", "git_user_email": "ci-robot@openshift.io", "fail": true, "refs": [ (select(.refs) | .refs)  , try(.extra_refs[])]}'
{
  "src_root": "/go",
  "log": "/dev/null",
  "git_user_name": "ci-robot",
  "git_user_email": "ci-robot@openshift.io",
  "fail": true,
  "refs": [
    {
      "org": "openshift",
      "repo": "microshift",
      "base_ref": "release-4.17",
      "workdir": true
    }
  ]
}


$ echo $JS_NO_EXTRA_REFS | jq '{"src_root": "/go", "log":"/dev/null", "git_user_name": "ci-robot", "git_user_email": "ci-robot@openshift.io", "fail": true, "refs": [ (select(.refs) | .refs)  , try(.extra_refs[])]}'
{
  "src_root": "/go",
  "log": "/dev/null",
  "git_user_name": "ci-robot",
  "git_user_email": "ci-robot@openshift.io",
  "fail": true,
  "refs": [
    {
      "org": "openshift",
      "repo": "release",
      "base_ref": "master",
      "base_sha": "b2878eae066f34139ad1d8a53c9a946d485ab0b8",
      "pulls": [
        {
          "number": 56279,
          "author": "pmtk",
          "sha": "8d18e4bb6f4ae446514bec755e638f0420d55258",
          "title": "USHIFT-4268: Drop `src` from microshift jobs",
          "link": "https://github.com/openshift/release/pull/56279"
        }
      ]
    }
  ]
}

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 13, 2024
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 13, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pacevedom, pmtk

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

1 similar comment
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 13, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pacevedom, pmtk

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

@pmtk
Copy link
Member Author

pmtk commented Sep 13, 2024

/pj-rehearse ack

@openshift-ci-robot
Copy link
Contributor

@pmtk: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-ci-robot openshift-ci-robot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Sep 13, 2024
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 13, 2024

@pmtk: all tests passed!

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-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit eeadf7f into openshift:master Sep 13, 2024
@pmtk pmtk deleted the drop-src-fix branch September 13, 2024 09:03
obochan-rh pushed a commit to obochan-rh/release that referenced this pull request Sep 24, 2024
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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants