On Fri, 2016-08-19 at 12:04 -0700, Bill Randle wrote:
> Add configs to build the eclipse poky neon plugin and drop support
> for the
> kepler branch. Also, generate md5sums for the eclipse plugin
> artifacts.
> (Note: building neon requires java 1.8.0.)
>
> [YOCTO #9940]
Pushed to master, thanks.
Joshua
>
> Signed-off-by: Bill Randle <william.c.ran...@intel.com>
> ---
> buildset-config.controller/nightly.conf | 6 +-
> ----
> buildset-config.controller/eclipse-plugin-neon.conf | 11
> +++++++++++
> buildset-config.controller/yoctoAB.conf | 4
> ++--
> .../site-packages/autobuilder/buildsteps/PublishArtifacts.py | 11
> ++++++++---
> 4 files changed, 26 insertions(+), 10 deletions(-)
> create mode 100644 buildset-config.controller/eclipse-plugin-
> neon.conf
>
> diff --git a/buildset-config.controller/nightly.conf b/buildset-
> config.controller/nightly.conf
> index c16c147..0f9dd4e 100644
> --- a/buildset-config.controller/nightly.conf
> +++ b/buildset-config.controller/nightly.conf
> @@ -23,14 +23,14 @@
> {'repourl':'git://git.yoctoproject.org/eclipse-poky',
> 'checkout':False,
> 'branch':'luna-master'}},
> - {'eclipse-poky-kepler':
> - {'repourl':'git://git.yoctoproject.org/eclipse-poky',
> - 'checkout':False,
> - 'branch':'kepler-master'}},
> {'eclipse-poky-mars':
> {'repourl':'git://git.yoctoproject.org/eclipse-poky',
> 'checkout':False,
> 'branch':'mars-master'}},
> + {'eclipse-poky-neon':
> + {'repourl':'git://git.yoctoproject.org/eclipse-poky',
> + 'checkout':False,
> + 'branch':'neon-master'}},
> {'meta-qt4':
> {'repourl':'git://git.yoctoproject.org/meta-qt4',
> 'branch':'master'}},
> @@ -103,7 +103,7 @@
> 'nightly-mips64': {}, 'nightly-arm64':
> {},
> 'nightly-rpm-non-rpm': {}, 'nightly-deb-
> non-deb': {}},
> 'schedulerNames_nowait' : {'nightly-
> uclibc':{}, 'build-appliance': {},
> - 'eclipse-plugin-kepler': {}, 'eclipse-
> plugin-mars': {},
> + 'eclipse-plugin-neon': {}, 'eclipse-
> plugin-mars': {},
> 'eclipse-plugin-luna': {}, 'nightly-non-
> gpl3': {},
> 'nightly-oecore': {}, 'nightly-
> world':{},'nightly-wic':{},
> 'nightly-world-lsb':{}, 'nightly-intel-
> gpl': {},
>
> diff --git a/buildset-config.controller/yoctoAB.conf b/buildset-
> config.controller/yoctoAB.conf
> index 0f9ba0c..fe9750b 100644
> --- a/buildset-config.controller/yoctoAB.conf
> +++ b/buildset-config.controller/yoctoAB.conf
> @@ -1,6 +1,6 @@
> [BuildSets]
> -order: ['nightly', 'eclipse-plugin-mars',
> - 'eclipse-plugin-kepler', 'eclipse-plugin-luna',
> +order: ['nightly', 'eclipse-plugin-neon', 'eclipse-plugin-mars',
> + 'eclipse-plugin-luna',
> 'nightly-arm', 'nightly-arm64', 'nightly-arm-lsb',
> 'nightly-mips', 'nightly-mips64', 'nightly-mips-lsb',
> 'nightly-ppc', 'nightly-ppc-lsb', 'nightly-no-x11',
> diff --git a/lib/python2.7/site-
> packages/autobuilder/buildsteps/PublishArtifacts.py
> b/lib/python2.7/site-
> packages/autobuilder/buildsteps/PublishArtifacts.py
> index 1a938fc..d8b554f 100644
> --- a/lib/python2.7/site-
> packages/autobuilder/buildsteps/PublishArtifacts.py
> +++ b/lib/python2.7/site-
> packages/autobuilder/buildsteps/PublishArtifacts.py
> @@ -96,10 +96,15 @@ class PublishArtifacts(ShellCommand):
> command=command+"mv " + adt_dev_dest +
> "/rootfs/qemux86-64 " + adt_dev_dest + "/rootfs/qemux86_64;"
> elif "eclipse-plugin" in artifact:
> artifact_base = artifact.replace("eclipse-
> plugin-", "")
> + deploy_dir =
> os.path.join(os.path.join(self.workerdir, buildername),
> "build/scripts")
> + # create md5sums only for the zip files
> + if os.environ.get('GEN_IMG_MD5') == "True":
> + command += "for x in `ls " + deploy_dir +
> "/*.zip`;"
> + command += "do md5sum $x >> " + "$x.md5sum;
> done;"
> command=command+"mkdir -p " + DEST + "/eclipse-
> plugin/"+ artifact_base +";"
> - command=command+"cp -R --no-dereference --
> preserve=links " + \
> - os.path.join(os.path.join(self.
> workerdir, buildername),
> - "build/scripts/org.
> *.zip") + \
> + command=command+"cp --no-dereference --
> preserve=links " + \
> + os.path.join(deploy_dir,
> "org.*.zip") + \
> + " " + os.path.join(deploy_dir,
> "org.*.md5sum") + \
> " " + DEST + "/eclipse-
> plugin/"+ artifact_base +";"
> elif artifact == "build-appliance":
> command=command+"mkdir -p " + DEST + "/" +
> BA_PUBLISH_DIR + ";"
>
> diff --git a/buildset-config.controller/eclipse-plugin-neon.conf
> b/buildset-config.controller/eclipse-plugin-neon.conf
> new file mode 100644
> index 0000000..0a262d2
> --- /dev/null
> +++ b/buildset-config.controller/eclipse-plugin-neon.conf
> @@ -0,0 +1,11 @@
> +[eclipse-plugin-neon]
> +builders: 'example-worker'
> +repos: [{'eclipse-poky-neon':
> + {'repourl':'git://git.yoctoproject.org/eclipse-poky',
> + 'branch':'neon-master'}}]
> +steps: [{'SetDest':{}},
> + {'CheckOutLayers': {}},
> + {'BuildEclipsePlugin': {'eclipsedir': 'eclipse-poky-neon'}},
> + {'PublishLayerTarballs':{}},
> + {'PublishArtifacts': {'artifacts': ['eclipse-plugin-
> neon']}}]
> +
--
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
