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

Include daily merge in metadata52 (temporary) #4451

Closed
wants to merge 469 commits into from

Conversation

joshmoore
Copy link
Member

This PR includes the daily snoopy branch into the metadata52 build.

manics and others added 30 commits January 21, 2016 16:23
This is for internal testing only, and will be changed when this is moved to the metadata CLI plugin.
BlitzGateway didn't work with self.client
Initial attempt at integrating the populate_metadata.py script into the OMERO CLI
Also fix ignored name parameter in make_file_annotation
This is consistent with the fs plugin
Modifies a5b270e (trac #12235), which means TestPopulateRois.testPopulateRoisPlate works. Also minor cleanups
--ns for filtering by namespace
--nsre for filtering by a namespace regular expression
…aling with rendering settings (rebased onto develop))
Repository: openmicroscopy/openmicroscopy
Excluded PRs:
  # PR 4452 jburel 'Ice 3.6' (label: breaking)
  # PR 4447 aleksandra-tarkowska 'sync/async worker support' (exclude comment)
  # PR 4372 aleksandra-tarkowska 'removing OMERO_HOME from settings' (exclude comment)
  # PR 4347 dominikl 'Gateway followup' (exclude comment)
Already up-to-date.

Merged PRs:
  # PR 4321 sbesson 'Modify omero.properties to point merge clients at staging registry'
  # PR 4355 sbesson 'Remove HDF5_DIR overriding in python_deps.sh'
  # PR 4379 sbesson 'Force configuration rewrite in bin/omero admin stop if no configuration exists'
  # PR 4392 will-moore 'Api tagged perms'
  # PR 4393 ximenesuk 'Import template'
  # PR 4398 mtbc 'improve graph operation performance'
  # PR 4399 dominikl 'Fixed ticket 13081'
  # PR 4401 aleksandra-tarkowska 'short url'
  # PR 4405 dominikl 'Metadata panel bugfixes'
  # PR 4406 dominikl 'LocationDialog loading'
  # PR 4408 rleigh-dundee 'Remove last vestiges of Ice 3.4'
  # PR 4416 PaulVanSchayck 'Also allow mapping of middleName via omero.ldap.user_mapping'
  # PR 4418 will-moore 'Robot fix xpath to dialog button'
  # PR 4426 joshmoore 'Extenstions to populate metadata 52'
  # PR 4427 bramalingam 'Rf center right panel'
  # PR 4428 joshmoore 'bump MessageSizeMax to 250mb (rebased onto develop)'
  # PR 4429 joshmoore 'Fix duplicate screen target (rebased onto develop)'
  # PR 4430 joshmoore 'render.py: new CLI plugin for dealing with rendering settings (rebased onto develop)'
  # PR 4431 aleksandra-tarkowska 'Disable orphaned container'
  # PR 4432 will-moore 'Masks in web viewer'
  # PR 4440 bramalingam 'Update OMERO build to consume BF5.1.8-snapshot'
  # PR 4444 dominikl 'Make lens tool work properly with units'
  # PR 4446 will-moore 'Bulk annotations right panel'
  # PR 4448 will-moore 'Show image in well develop'
  # PR 4453 jburel 'Ice typo'
  # PR 4455 will-moore 'Populate metadata example'
  # PR 4459 will-moore 'Get thumb version no images'
  # PR 4460 chris-allan 'Make sure pixel dimensions are in microns'
  # PR 4461 will-moore 'Reset interpolate_pixels to default value in test'
  # PR 4462 mtbc 'bugfixes for OMERO.blitz's graphs operations'

Repository: ome/scripts
Already up-to-date.

Merged PRs:
  # PR 107 will-moore 'Populate metadata'

Generated by OMERO-DEV-merge-push#232 (https://ci.openmicroscopy.org/job/OMERO-DEV-merge-push/232/)
@joshmoore
Copy link
Member Author

Closing for the moment. This is causing devspace/OMERO-build to fail with:

hudson.plugins.git.GitException: Command "git submodule update --init --recursive" returned status code 1:
stdout: 
stderr: error: 'refs/remotes/origin/dev_4_4' exists; cannot create 'refs/remotes/origin/dev_4_4/latest/submodules'
From git://github.com/snoopycrimecop/scripts
 ! [new branch]      dev_4_4/latest/submodules -> origin/dev_4_4/latest/submodules  (unable to update local ref)
error: 'refs/remotes/origin/dev_5_0' exists; cannot create 'refs/remotes/origin/dev_5_0/latest/submodules'
 ! [new branch]      dev_5_0/latest/submodules -> origin/dev_5_0/latest/submodules  (unable to update local ref)
error: 'refs/remotes/origin/dev_5_1' exists; cannot create 'refs/remotes/origin/dev_5_1/latest/bf_version_bump'
 ! [new branch]      dev_5_1/latest/bf_version_bump -> origin/dev_5_1/latest/bf_version_bump  (unable to update local ref)
error: 'refs/remotes/origin/dev_5_1' exists; cannot create 'refs/remotes/origin/dev_5_1/merge/daily'
 ! [new branch]      dev_5_1/merge/daily -> origin/dev_5_1/merge/daily  (unable to update local ref)
error: 'refs/remotes/origin/develop' exists; cannot create 'refs/remotes/origin/develop/breaking/bf_version_bump'
 ! [new branch]      develop/breaking/bf_version_bump -> origin/develop/breaking/bf_version_bump  (unable to update local ref)
error: 'refs/remotes/origin/develop' exists; cannot create 'refs/remotes/origin/develop/breaking/trigger'
 ! [new branch]      develop/breaking/trigger -> origin/develop/breaking/trigger  (unable to update local ref)
error: 'refs/remotes/origin/develop' exists; cannot create 'refs/remotes/origin/develop/cpp/merge'
 ! [new branch]      develop/cpp/merge -> origin/develop/cpp/merge  (unable to update local ref)
error: 'refs/remotes/origin/develop' exists; cannot create 'refs/remotes/origin/develop/latest/bf_version_bump'
 ! [new branch]      develop/latest/bf_version_bump -> origin/develop/latest/bf_version_bump  (unable to update local ref)
error: 'refs/remotes/origin/develop' exists; cannot create 'refs/remotes/origin/develop/latest/submodules'
 ! [new branch]      develop/latest/submodules -> origin/develop/latest/submodules  (unable to update local ref)
error: 'refs/remotes/origin/develop' exists; cannot create 'refs/remotes/origin/develop/merge/cpp'
 ! [new branch]      develop/merge/cpp -> origin/develop/merge/cpp  (unable to update local ref)
error: 'refs/remotes/origin/develop' exists; cannot create 'refs/remotes/origin/develop/merge/daily'
 ! [new branch]      develop/merge/daily -> origin/develop/merge/daily  (unable to update local ref)
error: 'refs/remotes/origin/metadata' exists; cannot create 'refs/remotes/origin/metadata/merge/trigger'
 ! [new branch]      metadata/merge/trigger -> origin/metadata/merge/trigger  (unable to update local ref)
error: some local refs could not be updated; try running
 'git remote prune origin' to remove any old, conflicting branches
Unable to fetch in submodule path 'components/tools/OmeroPy/scripts'

    at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1640)
    at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.access$500(CliGitAPIImpl.java:62)
    at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$6.execute(CliGitAPIImpl.java:904)

@joshmoore joshmoore closed this Feb 8, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.