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

Remove remaining references to airflow examples catalogs #2636

Merged
merged 3 commits into from
Apr 5, 2022

Conversation

kiersten-stokes
Copy link
Member

@kiersten-stokes kiersten-stokes commented Apr 5, 2022

Closes #2422

What changes were proposed in this pull request?

This PR cleans up a few remaining items related to the elyra-examples-airflow-catalog that is now deprecated, including:

  • Removes install/uninstall of the airflow examples from the catalog in the Makefile
  • Removes elyra-examples-airflow-catalog from test_requirements.txt and in setup.py test_requires
  • Changes the Airflow tests to rely on a url-type catalog (rather than the example catalog) that contains only a single operator (BashOperator). Related changes include:
    • Adds bash_operator.py to the test/pipeline/resources/components folder
      • NOTE: Initial commits referenced the bash_operator.py file hosted in the examples repo (see conftest.py:39) in order to show that tests are passing with this new url catalog. The url has been changes to the Elyra repo one in the latest commit, as this will be the 'permanent' reference (assuming we intend to eventually remove the Airflow examples content in the examples repo)
    • Changes some of the sample and validation pipelines in test/pipeline/resources to only refer to the BashOperator component (whereas the examples catalog previously had 4 available components that were referenced in these pipelines)

How was this pull request tested?

Tests are now passing with the changes mentioned above.

Developer's Certificate of Origin 1.1

   By making a contribution to this project, I certify that:

   (a) The contribution was created in whole or in part by me and I
       have the right to submit it under the Apache License 2.0; or

   (b) The contribution is based upon previous work that, to the best
       of my knowledge, is covered under an appropriate open source
       license and I have the right under that license to submit that
       work with modifications, whether created in whole or in part
       by me, under the same open source license (unless I am
       permitted to submit under a different license), as indicated
       in the file; or

   (c) The contribution was provided directly to me by some other
       person who certified (a), (b) or (c) and I have not modified
       it.

   (d) I understand and agree that this project and the contribution
       are public and that a record of the contribution (including all
       personal information I submit with it, including my sign-off) is
       maintained indefinitely and may be redistributed consistent with
       this project or the open source license(s) involved.

@elyra-bot
Copy link

elyra-bot bot commented Apr 5, 2022

Thanks for making a pull request to Elyra!

To try out this branch on binder, follow this link: Binder

@ptitzler ptitzler self-requested a review April 5, 2022 15:09
@ptitzler ptitzler added this to the 3.8.0 milestone Apr 5, 2022
conftest.py Outdated Show resolved Hide resolved
Copy link
Member

@ptitzler ptitzler left a comment

Choose a reason for hiding this comment

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

LGTM, pending the change in conftest.py (which will temporarily break the CI tests until the PR is merged.

@kiersten-stokes
Copy link
Member Author

kiersten-stokes commented Apr 5, 2022

With the latest commit, there will be the following expected test failures/errors:

FAILED elyra/tests/pipeline/test_validation.py::test_pipeline_aa_parent_node_missing_xcom_push[catalog_instance0] - KeyError: 'current_parameters'
FAILED elyra/tests/pipeline/airflow/test_component_parser_airflow.py::test_component_catalog_can_load_components_from_registries[catalog_instance0] - assert 0 > 0
FAILED elyra/tests/pipeline/airflow/test_processor_airflow.py::test_same_name_operator_in_pipeline[catalog_instance0-resources/validation_pipelines/aa_operator_same_name.json] - AttributeError: 'NoneType' object has no attribute 'properties'
ERROR elyra/tests/pipeline/airflow/test_processor_airflow.py::test_create_file_custom_components[catalog_instance0-resources/sample_pipelines/pipeline_with_airflow_components.json] - AttributeError: 'NoneType' object has no attribute 'properties'

@ptitzler
Copy link
Member

ptitzler commented Apr 5, 2022

With the latest commit, there will be the following expected test failures/errors:

Confirmed! Other changes look good 👍

@akchinSTC akchinSTC merged commit 22fe647 into elyra-ai:master Apr 5, 2022
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.

Refactor unit tests that depend on deprecated airflow example pipeline components
3 participants