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

Branch aware ci tests #209

Merged
merged 11 commits into from
Dec 8, 2022
Merged

Branch aware ci tests #209

merged 11 commits into from
Dec 8, 2022

Conversation

pandu-k
Copy link
Collaborator

@pandu-k pandu-k commented Dec 7, 2022

  • What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)
    CI update

  • What is the current behavior? (You can also link to an open issue here)
    The tests alway target mainline. There is no way to test against an image on Docker hub

  • What is the new behavior (if this is a feature change)?
    The tests are now against the current branch. There is an optional input is also available to specify the image name - this can be used to test against images on Docker hub

Have unit tests been run against this PR? (Has there also been any additional testing?)

  • The entire test suite has been run on this branch. All passed. Confirmed (via reading the log output) that the current branch, rather than mainline, was used to build the test image

  • The entire test suite was also run with the optional image input set to marqo:0.0.4. For all tests besides the unit tests, the suite starts but never completes. This is expected because the current API test suite can't read the outdated root endpoint, preventing it from starting. This confirms that manually setting the image runs the test suite against that image (rather than the image built by test suite).

Does this PR introduce a breaking change? (What changes might users need to make in their application due to this PR?)
No

Other information:

  • This change only becomes available on branches that use the CI pipeline files updated by this PR.
  • To take advantage of this pipeline update, checkout the files from this PR into your feature branch.

Please check if the PR fulfills these requirements

  • The commit message follows our guidelines
  • Tests for the changes have been added (for bug fixes/features)
  • Docs have been added / updated (for bug fixes / features)

@pandu-k pandu-k temporarily deployed to marqo-test-suite December 7, 2022 05:05 — with GitHub Actions Inactive
@pandu-k pandu-k temporarily deployed to marqo-test-suite December 7, 2022 05:37 — with GitHub Actions Inactive
@pandu-k pandu-k temporarily deployed to marqo-test-suite December 7, 2022 05:37 — with GitHub Actions Inactive
@pandu-k pandu-k temporarily deployed to marqo-test-suite December 7, 2022 05:37 — with GitHub Actions Inactive
@pandu-k pandu-k temporarily deployed to marqo-test-suite December 7, 2022 05:37 — with GitHub Actions Inactive
@pandu-k pandu-k temporarily deployed to marqo-test-suite December 7, 2022 05:37 — with GitHub Actions Inactive
@pandu-k pandu-k temporarily deployed to marqo-test-suite December 7, 2022 05:37 — with GitHub Actions Inactive
@pandu-k pandu-k temporarily deployed to marqo-test-suite December 7, 2022 06:31 — with GitHub Actions Inactive
@pandu-k pandu-k marked this pull request as ready for review December 7, 2022 09:27
@pandu-k pandu-k temporarily deployed to marqo-test-suite December 7, 2022 09:31 — with GitHub Actions Inactive
@pandu-k pandu-k requested a review from jn2clark December 7, 2022 10:36
@jn2clark jn2clark merged commit 3d232da into mainline Dec 8, 2022
jn2clark added a commit that referenced this pull request Dec 8, 2022
* Branch aware ci tests (#209)

* set the MQ_API_TEST_BRANCH to the current branch

* setting github ref to just branch name

* Adding quotes around env var

* fixed syntax error

* parsing the github.ref string

* exporting just before running

* added image_to_test input

* fix: typo

* default image to test is now explicit

* updated documentation for image_to_test var

* Update unit_test_CI.yml

* tox pinned to 3.26

Co-authored-by: pandu-k <107458762+pandu-k@users.noreply.github.com>
Co-authored-by: Pandu Oliver Kerr <pandu@s2search.io>
pandu-k added a commit that referenced this pull request Dec 13, 2022
* Visual search update (#210)

* add parametrisation for chunking, overlapping boxes and combined model+boxes

* add more tests

* integrate yolox and simple grid changes

* helper functions for opencv and yolox

* add yolox patch class and helper functions

* update to use opencv

* update model cache and add logging

* fix model caching and device selection

* device conflicts

* add attention based bb generation

* update bboxes and test yolo

* refactor and add attention based ViT for bb determination

* create dino specific utils file for vit attention

* include dino files

* split the image file into seperate utils

* refactor, split into seperate files and use a proper base class

* add more tests

* update and add more tests

* refactor and clean up

* add more packages

* clean up and refactor

* update tests

* docker and cloud versions

* change

* fix device for owl

* update types and dco strings

* rename file

* rename file

* move tests

* pytorch utils test

* add another error for model loading

* update functions to handle some edge cases and update types

* add more tests

* update the yolox utils to download the proper model

* add yolox specific tests

* update reqs and setup to be on the latest

* update dockerfile to be same as new one

* clean up

* add the example and app

* update file locations

* update demo

* bump model version

* update demo

* minor text edits

* update demo

* update demo

* better error handling

* update tests

* change to PIL error

* add more error types

* small fixes for errors

* error handling

* update tests

* remove models

* clean up, doc strings and formatting

* update tests

* minor formatting

Co-authored-by: Jesse Clark <jesse@s2search.io>

* update some function names after merge

* clean up and rename

* Pinning tox ci (#211)

* Branch aware ci tests (#209)

* set the MQ_API_TEST_BRANCH to the current branch

* setting github ref to just branch name

* Adding quotes around env var

* fixed syntax error

* parsing the github.ref string

* exporting just before running

* added image_to_test input

* fix: typo

* default image to test is now explicit

* updated documentation for image_to_test var

* Update unit_test_CI.yml

* tox pinned to 3.26

Co-authored-by: pandu-k <107458762+pandu-k@users.noreply.github.com>
Co-authored-by: Pandu Oliver Kerr <pandu@s2search.io>

* Update Dockerfile

remove space

* clean up

* move to headless opencv

* tidying up

* update error

* minor edits

* fix PR feedback and add more descriptions in the docstrings

* use literal type

* clean up, make the names more descriptive

* change logging level to debug for some messages

Co-authored-by: Jesse Clark <jesse@s2search.io>
Co-authored-by: pandu-k <107458762+pandu-k@users.noreply.github.com>
Co-authored-by: Pandu Oliver Kerr <pandu@s2search.io>
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.

2 participants