diff --git a/publish/.classpath b/publish/.classpath new file mode 100644 index 0000000..287c1ab --- /dev/null +++ b/publish/.classpath @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/publish/.gitignore b/publish/.gitignore new file mode 100644 index 0000000..abed335 --- /dev/null +++ b/publish/.gitignore @@ -0,0 +1,7 @@ +/do$_publish_closure4.class +/do$_resetfolders_closure1.class +/do$_resetfolders_closure2.class +/do$_resetfolders_closure3.class +/do$_stripgithistory_closure5.class +/do.class +/publish_item_select.class diff --git a/publish/.project b/publish/.project new file mode 100644 index 0000000..5c60328 --- /dev/null +++ b/publish/.project @@ -0,0 +1,18 @@ + + + publish_item_select + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.groovy.core.groovyNature + org.eclipse.jdt.core.javanature + + diff --git a/publish/.settings/org.eclipse.jdt.groovy.core.prefs b/publish/.settings/org.eclipse.jdt.groovy.core.prefs new file mode 100644 index 0000000..1e68ed6 --- /dev/null +++ b/publish/.settings/org.eclipse.jdt.groovy.core.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +groovy.compiler.level=25 +groovy.script.filters=**/*.dsld,y,**/*.gradle,n diff --git a/publish/publish_item_select.groovy b/publish/publish_item_select.groovy index 47b64dc..a7cfa1b 100755 --- a/publish/publish_item_select.groovy +++ b/publish/publish_item_select.groovy @@ -5,8 +5,6 @@ metalevels = 2 commonscriptsrepo="git@hydra:jenkinsautobuild/Common_scripts.git" -import hudson.model.* - def log(message) { boolean dolog = true if (dolog) { @@ -52,14 +50,10 @@ def gitCloneOrPull(String repo, String folder) { def loadmetaclass(String commonscripts, String metafolder) { def metafolderscriptfile = "${commonscripts}/meta/folder.groovy" - log("Loading script: ${metafolderscriptfile}") GroovyShell shell = new GroovyShell() def metafolderscript = shell.parse(new File(metafolderscriptfile)) - log("metafolderscript is ${metafolderscript.getClass()}") def meta = metafolderscript.metafromfolderSlurper(metafolder) - log("meta is ${meta.getClass()}") - return meta } @@ -68,7 +62,6 @@ def makeworking() { r.waitFor() def user = r.text.trim() - log("User is ${user}") def rootfolder = "/home/${user}/tmp" createfolder(rootfolder) @@ -82,8 +75,6 @@ def makeworking() { // Load the meta folder class that interprets the meta repo def meta = loadmetaclass(commonscripts, metareporoot) - log("2: meta is ${meta.getClass()}") - return meta } @@ -93,21 +84,9 @@ def List getItems(meta) { log("metaitems is ${metaitems.getClass()}") try { - log("Getting items") - def p = ['pwd'].execute() - p.waitFor() - menuitems.add(p.text.trim()) - menuitems.add(metarepoext) - menuitems.add(metalevels) - - menuitems.add("ATLAS_SERVICES CORE_INSTALL installers/**") - - menuitems.add("Item 2") - menuitems.add("Item 3") for (key in metaitems.keySet()) { def releaseinfo = metaitems[key] menuitems.add(releaseinfo.offsetpath) - //MetaInfo meta } return menuitems } catch (Exception e) { @@ -117,10 +96,9 @@ def List getItems(meta) { } def meta = makeworking() -log("3: meta is ${meta.getClass()}") +def items = getItems(meta) count = 0 -def items = getItems(meta) for (item in items) { count += 1 log ("${count}: ${item}")