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

Improvements to the QA upgrade script #8

Merged
merged 10 commits into from
Jul 23, 2013

Conversation

sbesson
Copy link
Member

@sbesson sbesson commented Jul 9, 2013

This PR reviews the OMERO-qa-upgrade.py script to support the upgrade of multiple OMERO instances on the same Jenkins node (e.g. OMERO 4 and OMERO 5)

  • fix some hard-coded OMERO-CURRENT to systematically use the SYM envvar across the script

  • refactor the artifact component listing using a dictionary to simplify the addition of downloadable artefacts

  • refactor download_server() into a generic download() method

  • add logic to call bin/omero admin ports --prefix using the PREFIX environment variable

    PREFIX=1 python OMERO-qa-upgrade.py
    
  • set the BUILD_ID environment variable to DONT_KILL_ME when called from Jenkins job to prevent server shutdown at job termination

To be tested in the context of the OMERO-matlab-training-stable and OMERO-matlab-training-develop jobs

/cc @manics

@manics
Copy link
Member

manics commented Jul 10, 2013

Tested locally on my Mac. I had to change Line 56
to
DEFINE("WEB", '[["localhost", 4064, "%s"], ["gretzky.openmicroscopy.org.uk", 4064, "gretzky"], ["howe.openmicroscopy.org.uk", 4064, "howe"]]' % NAME)
(remove one set of outer quotes), as I was getting an invalid JSON error from omero web start/stop. Obviously not a problem on the CI servers, so maybe I've got a different Python module version.

Is this a good time to clean up or delete some code, e.g. UnixUpgrade.confgure is obviously a typo, but doesn't seem to be needed anyway.

Also should this be runnable the first time the server is setup so no symlink or server is present? Currently fails in Upgrade.set_cli. Not a problem if it doesn't since it's a one-off.

@sbesson
Copy link
Member Author

sbesson commented Jul 17, 2013

@manics: addressed your 2 comments.

Last comment makes sense, but I would rather work on it as part of a new PR (and couple this with a Travis build testing the script)

@manics
Copy link
Member

manics commented Jul 17, 2013

Good to merge.

I've cc-ed you on https://trac.openmicroscopy.org.uk/ome/ticket/11282

chris-allan added a commit that referenced this pull request Jul 23, 2013
Improvements to the QA upgrade script
@chris-allan chris-allan merged commit 112c308 into ome:master Jul 23, 2013
@sbesson sbesson deleted the qaupgrade_refactor branch July 23, 2013 09:12
@sbesson sbesson added this to the 0.1.0 milestone Dec 11, 2017
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.

3 participants