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

Add support for downloading artifacts from matrix builds #26

Merged
merged 10 commits into from
Jan 27, 2014

Conversation

manics
Copy link
Member

@manics manics commented Jan 17, 2014

Examples:

omego download --branch OMERO-5.1-latest --skipunzip matlab -v # Defaults to ICE=3.5
omego download --branch OMERO-5.1-latest --skipunzip matlab --labels=ICE=3.X -v

Multiple labels in any order (not much practical use at present):

omego download --branch OMERO-5.1-latest --skipunzip matlab --labels=label=ome-c6100-3,ICE=3.3

Must have only one match, otherwise should fail:

omego download --branch OMERO-5.1-latest --skipunzip matlab --labels='' -v
omego download --branch OMERO-5.1-latest --skipunzip matlab --labels='X=nonexistent' -v

Also --dry-run goes a bit further (downloads job XML), and an invalid job name is trapped:

omego download --branch OMERO-5.1-latest --skipunzip matlab -vn
omego download --branch NON-EXISTENT-JOB --skipunzip matlab -vn

Non-matrix jobs should still work

omego download --branch OMERO-4.4-merge-ice35 --skipunzip matlab -v 

And omego upgrade should work too.

@manics
Copy link
Member Author

manics commented Jan 19, 2014

I'll fixup the tests...

AFAICT the only reason this previously worked was that calling omero.cli.CLI() or self.cli.loadplugins() in Upgrade.setup_script_environment() auto-creates a default config.xml (see comment in Upgrade.__init__()).

Why has it broken now? No idea... maybe it's to do with importing multiple versions of the CLI in the nose test harness. Previously only one server was being upgraded in the test run.... perhaps when importing the CLI for the second time it isn't properly imported?
@manics
Copy link
Member Author

manics commented Jan 21, 2014

Travis is now happy, though note commit message 34cf59c

@pwalczysko
Copy link
Member

Meged this branch locally, and then, using the routine, where the omega command is replaced by the python execution of main.py in my local ome-setup repo like this:

[petr@LS25165 ~/Work/omero5-server]$ python ~/Work/omero-setup/omego/main.py download --branch OMERO-5.1-latest --skipunzip matlab -v

I started to execute the commands. See the output below.

[petr@LS25165 ~/Work/omero5-server]$ python ~/Work/omero-setup/omego/main.py download --branch OMERO-5.1-latest --skipunzip matlab -v
2014-01-22 12:26:52,229 [omego.artifa] DEBUG             artifact => matlab
2014-01-22 12:26:52,229 [omego.artifa] DEBUG               branch => OMERO-5.1-latest
2014-01-22 12:26:52,229 [omego.artifa] DEBUG                build => http://ci.openmicroscopy.org/job/OMERO-5.1-latest/lastSuccessfulBuild/
2014-01-22 12:26:52,229 [omego.artifa] DEBUG                   ci => ci.openmicroscopy.org
2014-01-22 12:26:52,229 [omego.artifa] DEBUG               labels => ICE=3.5
2014-01-22 12:26:52,229 [omego.artifa] DEBUG                unzip => unzip
2014-01-22 12:26:52,247 [omego.artifa] DEBUG Fetching xml from http://ci.openmicroscopy.org/job/OMERO-5.1-latest/lastSuccessfulBuild/api/xml code:200
2014-01-22 12:26:52,254 [omego.artifa] DEBUG Searching for matrix runs matching: set(['ICE=3.5'])
2014-01-22 12:26:52,288 [omego.artifa] DEBUG Fetching xml from http://ci.openmicroscopy.org/job/OMERO-5.1-latest/ICE=3.5,label=ome-c6100-3/19/api/xml code:200
2014-01-22 12:26:52,300 [omego.artifa] INFO  Downloading http://ci.openmicroscopy.org/job/OMERO-5.1-latest/ICE=3.5,label=ome-c6100-3/19/artifact/src/target/OMERO.matlab-5.0.0-rc1-108-3a67ad1-ice35-b19.zip
[petr@LS25165 ~/Work/omero5-server]$ 

@pwalczysko
Copy link
Member

[petr@LS25165 ~/Work/omero5-server]$ python ~/Work/omero-setup/omego/main.py download --branch OMERO-5.1-latest --skipunzip matlab --labels=ICE=3.3 -v
2014-01-22 12:30:42,076 [omego.artifa] DEBUG             artifact => matlab
2014-01-22 12:30:42,077 [omego.artifa] DEBUG               branch => OMERO-5.1-latest
2014-01-22 12:30:42,077 [omego.artifa] DEBUG                build => http://ci.openmicroscopy.org/job/OMERO-5.1-latest/lastSuccessfulBuild/
2014-01-22 12:30:42,077 [omego.artifa] DEBUG                   ci => ci.openmicroscopy.org
2014-01-22 12:30:42,077 [omego.artifa] DEBUG               labels => ICE=3.3
2014-01-22 12:30:42,077 [omego.artifa] DEBUG                unzip => unzip
2014-01-22 12:30:42,101 [omego.artifa] DEBUG Fetching xml from http://ci.openmicroscopy.org/job/OMERO-5.1-latest/lastSuccessfulBuild/api/xml code:200
2014-01-22 12:30:42,108 [omego.artifa] DEBUG Searching for matrix runs matching: set(['ICE=3.3'])
2014-01-22 12:30:42,123 [omego.artifa] DEBUG Fetching xml from http://ci.openmicroscopy.org/job/OMERO-5.1-latest/ICE=3.3,label=ome-c6100-3/19/api/xml code:200
2014-01-22 12:30:42,136 [omego.artifa] INFO  Downloading http://ci.openmicroscopy.org/job/OMERO-5.1-latest/ICE=3.3,label=ome-c6100-3/19/artifact/src/target/OMERO.matlab-5.0.0-rc1-108-3a67ad1-ice33-b19.zip
[petr@LS25165 ~/Work/omero5-server]$ 

@pwalczysko
Copy link
Member

[petr@LS25165 ~/Work/omero5-server]$ python ~/Work/omero-setup/omego/main.py download --branch OMERO-5.1-latest --skipunzip matlab --labels=ICE=3.4 -v
2014-01-22 12:31:21,306 [omego.artifa] DEBUG             artifact => matlab
2014-01-22 12:31:21,306 [omego.artifa] DEBUG               branch => OMERO-5.1-latest
2014-01-22 12:31:21,307 [omego.artifa] DEBUG                build => http://ci.openmicroscopy.org/job/OMERO-5.1-latest/lastSuccessfulBuild/
2014-01-22 12:31:21,307 [omego.artifa] DEBUG                   ci => ci.openmicroscopy.org
2014-01-22 12:31:21,307 [omego.artifa] DEBUG               labels => ICE=3.4
2014-01-22 12:31:21,307 [omego.artifa] DEBUG                unzip => unzip
2014-01-22 12:31:21,325 [omego.artifa] DEBUG Fetching xml from http://ci.openmicroscopy.org/job/OMERO-5.1-latest/lastSuccessfulBuild/api/xml code:200
2014-01-22 12:31:21,332 [omego.artifa] DEBUG Searching for matrix runs matching: set(['ICE=3.4'])
2014-01-22 12:31:21,353 [omego.artifa] DEBUG Fetching xml from http://ci.openmicroscopy.org/job/OMERO-5.1-latest/ICE=3.4,label=ome-c6100-3/19/api/xml code:200
2014-01-22 12:31:21,362 [omego.artifa] INFO  Downloading http://ci.openmicroscopy.org/job/OMERO-5.1-latest/ICE=3.4,label=ome-c6100-3/19/artifact/src/target/OMERO.matlab-5.0.0-rc1-108-3a67ad1-ice34-b19.zip
[petr@LS25165 ~/Work/omero5-server]$ 

@pwalczysko
Copy link
Member

[petr@LS25165 ~/Work/omero5-server]$ python ~/Work/omero-setup/omego/main.py download --branch OMERO-5.1-latest --skipunzip matlab --labels='' -v
2014-01-22 12:34:38,280 [omego.artifa] DEBUG             artifact => matlab
2014-01-22 12:34:38,280 [omego.artifa] DEBUG               branch => OMERO-5.1-latest
2014-01-22 12:34:38,280 [omego.artifa] DEBUG                build => http://ci.openmicroscopy.org/job/OMERO-5.1-latest/lastSuccessfulBuild/
2014-01-22 12:34:38,280 [omego.artifa] DEBUG                   ci => ci.openmicroscopy.org
2014-01-22 12:34:38,280 [omego.artifa] DEBUG                unzip => unzip
2014-01-22 12:34:38,297 [omego.artifa] DEBUG Fetching xml from http://ci.openmicroscopy.org/job/OMERO-5.1-latest/lastSuccessfulBuild/api/xml code:200
2014-01-22 12:34:38,301 [omego.artifa] DEBUG Searching for matrix runs matching: set([])
2014-01-22 12:34:38,301 [omego.artifa] ERROR Found 3 matching matrix build runs: ['http://ci.openmicroscopy.org/job/OMERO-5.1-latest/ICE=3.3,label=ome-c6100-3/19/', 'http://ci.openmicroscopy.org/job/OMERO-5.1-latest/ICE=3.4,label=ome-c6100-3/19/', 'http://ci.openmicroscopy.org/job/OMERO-5.1-latest/ICE=3.5,label=ome-c6100-3/19/']
Expected one matching run, found 3
[petr@LS25165 ~/Work/omero5-server]$ 

@pwalczysko
Copy link
Member

[petr@LS25165 ~/Work/omero5-server]$ python ~/Work/omero-setup/omego/main.py download --branch OMERO-5.1-latest --skipunzip matlab --labels='X=nonexistent' -v
2014-01-22 12:41:59,926 [omego.artifa] DEBUG             artifact => matlab
2014-01-22 12:41:59,926 [omego.artifa] DEBUG               branch => OMERO-5.1-latest
2014-01-22 12:41:59,926 [omego.artifa] DEBUG                build => http://ci.openmicroscopy.org/job/OMERO-5.1-latest/lastSuccessfulBuild/
2014-01-22 12:41:59,926 [omego.artifa] DEBUG                   ci => ci.openmicroscopy.org
2014-01-22 12:41:59,926 [omego.artifa] DEBUG               labels => X=nonexistent
2014-01-22 12:41:59,927 [omego.artifa] DEBUG                unzip => unzip
2014-01-22 12:42:00,286 [omego.artifa] DEBUG Fetching xml from http://ci.openmicroscopy.org/job/OMERO-5.1-latest/lastSuccessfulBuild/api/xml code:200
2014-01-22 12:42:00,294 [omego.artifa] DEBUG Searching for matrix runs matching: set(['X=nonexistent'])
2014-01-22 12:42:00,294 [omego.artifa] ERROR Found 0 matching matrix build runs: []
Expected one matching run, found 0
[petr@LS25165 ~/Work/omero5-server]$ 

@pwalczysko
Copy link
Member

[petr@LS25165 ~/Work/omero5-server]$ python ~/Work/omero-setup/omego/main.py download --branch OMERO-5.1-latest --skipunzip matlab -vn
2014-01-22 12:46:09,771 [omego.artifa] DEBUG             artifact => matlab
2014-01-22 12:46:09,771 [omego.artifa] DEBUG               branch => OMERO-5.1-latest
2014-01-22 12:46:09,771 [omego.artifa] DEBUG                build => http://ci.openmicroscopy.org/job/OMERO-5.1-latest/lastSuccessfulBuild/
2014-01-22 12:46:09,771 [omego.artifa] DEBUG                   ci => ci.openmicroscopy.org
2014-01-22 12:46:09,771 [omego.artifa] DEBUG               labels => ICE=3.5
2014-01-22 12:46:09,771 [omego.artifa] DEBUG                unzip => unzip
2014-01-22 12:46:09,785 [omego.artifa] DEBUG Fetching xml from http://ci.openmicroscopy.org/job/OMERO-5.1-latest/lastSuccessfulBuild/api/xml code:200
2014-01-22 12:46:09,792 [omego.artifa] DEBUG Searching for matrix runs matching: set(['ICE=3.5'])
2014-01-22 12:46:09,806 [omego.artifa] DEBUG Fetching xml from http://ci.openmicroscopy.org/job/OMERO-5.1-latest/ICE=3.5,label=ome-c6100-3/19/api/xml code:200
[petr@LS25165 ~/Work/omero5-server]$ 

@pwalczysko
Copy link
Member

[petr@LS25165 ~/Work/omero5-server]$ python ~/Work/omero-setup/omego/main.py download --branch NON-EXISTENT-JOB --skipunzip matlab -vn
2014-01-22 12:49:39,570 [omego.artifa] DEBUG             artifact => matlab
2014-01-22 12:49:39,570 [omego.artifa] DEBUG               branch => NON-EXISTENT-JOB
2014-01-22 12:49:39,570 [omego.artifa] DEBUG                build => http://ci.openmicroscopy.org/job/NON-EXISTENT-JOB/lastSuccessfulBuild/
2014-01-22 12:49:39,570 [omego.artifa] DEBUG                   ci => ci.openmicroscopy.org
2014-01-22 12:49:39,570 [omego.artifa] DEBUG               labels => ICE=3.5
2014-01-22 12:49:39,570 [omego.artifa] DEBUG                unzip => unzip
2014-01-22 12:49:39,575 [omego.artifa] ERROR Failed to get CI XML (HTTP Error 404: Not Found)
Job lookup failed, is the job name correct?
[petr@LS25165 ~/Work/omero5-server]$ 

@pwalczysko
Copy link
Member

[petr@LS25165 ~/Work/omero5-server]$ python ~/Work/omero-setup/omego/main.py  download --branch OMERO-4.4-merge-ice35 --skipunzip matlab -v
2014-01-22 12:50:50,164 [omego.artifa] DEBUG             artifact => matlab
2014-01-22 12:50:50,164 [omego.artifa] DEBUG               branch => OMERO-4.4-merge-ice35
2014-01-22 12:50:50,164 [omego.artifa] DEBUG                build => http://ci.openmicroscopy.org/job/OMERO-4.4-merge-ice35/lastSuccessfulBuild/
2014-01-22 12:50:50,164 [omego.artifa] DEBUG                   ci => ci.openmicroscopy.org
2014-01-22 12:50:50,164 [omego.artifa] DEBUG               labels => ICE=3.5
2014-01-22 12:50:50,164 [omego.artifa] DEBUG                unzip => unzip
2014-01-22 12:50:50,312 [omego.artifa] DEBUG Fetching xml from http://ci.openmicroscopy.org/job/OMERO-4.4-merge-ice35/lastSuccessfulBuild/api/xml code:200
2014-01-22 12:50:50,324 [omego.artifa] INFO  Downloading http://ci.openmicroscopy.org/job/OMERO-4.4-merge-ice35/lastSuccessfulBuild/artifact/src/target/OMERO.matlab-4.4.10-3-19c9a1e-ice35-b181.zip
[petr@LS25165 ~/Work/omero5-server]$ 

@pwalczysko
Copy link
Member

The omego upgrade worked too as expected. All seems fine here.
After discussion with @manics I am creating a github issue on one-setup repo for simplifying the options on omego. See #27

@sbesson
Copy link
Member

sbesson commented Jan 27, 2014

@manics: any additional commit?

@manics
Copy link
Member Author

manics commented Jan 27, 2014

@sbesson No.

sbesson added a commit that referenced this pull request Jan 27, 2014
Add support for downloading artifacts from matrix builds
@sbesson sbesson merged commit 3c630c0 into ome:master Jan 27, 2014
@manics manics deleted the artifacts_matrix branch January 28, 2014 10:06
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