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

Fixed "Pyxis rejects test library development version numbers" #254

Merged
merged 1 commit into from
Apr 12, 2024

Conversation

nsilla
Copy link
Contributor

@nsilla nsilla commented Apr 10, 2024

CheckDallasWorkload: preflight-green

The Pyxis API currently only supports the test library version 1.9.1 and rejects any development version based on that one (for instance, 1.9.1+abcdef0123456789).

We had a partial fix that would replace the test library commit ID in the pushed test results, but it left the version number unaltered, thus causing the Pyxis API to reject the requests.

This fix overrides the version number (if needed) along with the commit ID in the test results data.

build-depends: redhat-openshift-ecosystem/openshift-preflight#1139

@nsilla nsilla requested a review from a team as a code owner April 10, 2024 14:20
@dcibot
Copy link
Collaborator

dcibot commented Apr 10, 2024

Starting dci-check-change job.

@dcibot
Copy link
Collaborator

dcibot commented Apr 10, 2024

@tkrishtop
Copy link
Contributor

check workload preflight-green

@dcibot
Copy link
Collaborator

dcibot commented Apr 10, 2024

@@ -8,10 +8,9 @@
preflight_output: "{{ lookup('file', preflight_results_file) | from_json }}"
preflight_artifact: "{{ lookup('file', preflight_log_file) | to_json }}"
pyxis_apikey: "{{ lookup('file', pyxis_apikey_path) }}"
preflight_release: "{{ preflight_output.test_library.version.split('+')[0] }}"
Copy link
Contributor

Choose a reason for hiding this comment

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

From the last failure I believe we need to define preflight_release: fact separately after this task or maybe move the fact preflight_output: as a var in this task?

@@ -8,10 +8,9 @@
preflight_output: "{{ lookup('file', preflight_results_file) | from_json }}"
preflight_artifact: "{{ lookup('file', preflight_log_file) | to_json }}"
pyxis_apikey: "{{ lookup('file', pyxis_apikey_path) }}"
preflight_release: "{{ preflight_output.test_library.version.split('+')[0] }}"
Copy link
Contributor

Choose a reason for hiding this comment

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

- name: Retrieve results of the preflight tests
  vars:
    preflight_prefix: "preflight_operator_{{ operator.name }}"
    preflight_results_file: "{{ job_logs.path }}/{{ preflight_prefix }}_results.json"
    preflight_log_file: "{{ job_logs.path }}/{{ preflight_prefix }}_preflight.log"
  set_fact:
    preflight_output: "{{ lookup('file', preflight_results_file) | from_json }}"
    preflight_artifact: "{{ lookup('file', preflight_log_file) | to_json }}"
    pyxis_apikey: "{{ lookup('file', pyxis_apikey_path) }}"

- name: Set preflight release
  set_fact: 
    preflight_release: "{{ preflight_output.test_library.version.split('+')[0] }}"

@tkrishtop
Copy link
Contributor

also, let's change the galaxy.yml and .spec by bumping the minor version in-there

@dcibot
Copy link
Collaborator

dcibot commented Apr 11, 2024

  • dci-check-change no check (not a code change)

Copy link

@tkrishtop
Copy link
Contributor

check workload preflight-green

@dcibot
Copy link
Collaborator

dcibot commented Apr 11, 2024

tkrishtop
tkrishtop previously approved these changes Apr 11, 2024
Copy link
Contributor

@tkrishtop tkrishtop left a comment

Choose a reason for hiding this comment

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

@nsilla
Copy link
Contributor Author

nsilla commented Apr 11, 2024

The tests are green, thanks @nsilla ! Let's also bump the collection version.

Done.

Have another job running to have all green.

@dcibot
Copy link
Collaborator

dcibot commented Apr 11, 2024

Starting dci-check-change job.

Copy link

@dcibot
Copy link
Collaborator

dcibot commented Apr 11, 2024

Copy link
Contributor

@tkrishtop tkrishtop left a comment

Choose a reason for hiding this comment

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

LGTM, the job is green

@tkrishtop tkrishtop added this pull request to the merge queue Apr 11, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Apr 11, 2024
@nsilla nsilla added this pull request to the merge queue Apr 12, 2024
Merged via the queue into main with commit ab56384 Apr 12, 2024
8 checks passed
@nsilla nsilla deleted the preflight_dev_version branch April 12, 2024 08:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants