On 30 November 2016 at 19:17, Mike Holmes mike.holmes@linaro.org wrote:
Can we just change the tag in [1] v1.11.0.0_monarch -> v1.11.0.0-monarch
Yes that tag is broken, that should never been applied to the monarch branch. The reason the debian fails every day is that we merged the monarch branch into master with this broken tag and thats why the build fails.
We should never merge from anywere into master. 1. Since we agreed that patches should go to master and then we should decide that its a bugfix for a specific release and that patch should be cherry-picked for that release branch. Never this way around. I think we need to update the doc to reflect what we actually agreed on or will agree on.
2. cherry-pick into next from api-next [1] and then simply do a rebase onto master from next before a release, tag it then push both the branch "master" and the new release tag. I think we need to update the doc [1] so it states a rebase insted a cherry-pick from next to master.
Cheers, Anders [1] http://docs.opendataplane.org/snapshots/odp-publish/generic/usr_html/latest/...
[1] https://git.linaro.org/lng/odp.git
On 30 November 2016 at 08:52, ci_notify@linaro.org wrote:
https://ci.linaro.org/jenkins/job/build-odp-deb/365/Changes:
[maxim.uvarov] test: linux-gen: fix termination in mmap_vlan_ins
Started by upstream project "trigger-build-odp" build number 342 originally caused by: Started by an SCM change [EnvInject] - Loading node environment variables. Building remotely on aarch64-05-9b658eb7661c (docker-jessie-arm64 docker-jessie-arm64-05) in workspace https://ci.linaro.org/jenkins/job/build-odp-deb/ws/ [YAD-PLUGIN] Injecting DOCKER_CONTAINER_ID variable. [YAD-PLUGIN] Injecting JENKINS_CLOUD_ID variable. [YAD-PLUGIN] DOCKER_HOST variable. [YAD-PLUGIN] Injecting DOCKER_CONTAINER_ID variable. [YAD-PLUGIN] Injecting JENKINS_CLOUD_ID variable. [YAD-PLUGIN] DOCKER_HOST variable. Cloning the remote Git repository Cloning repository https://git.linaro.org/lng/odp.git
/usr/bin/git init
https://ci.linaro.org/jenkins/job/build-odp-deb/ws/odp # timeout=10 Fetching upstream changes from https://git.linaro.org/lng/odp.git
/usr/bin/git --version # timeout=10 /usr/bin/git fetch --tags --progress https://git.linaro.org/lng/odp.git
+refs/heads/*:refs/remotes/origin/*
/usr/bin/git config remote.origin.url
https://git.linaro.org/lng/odp.git # timeout=10
/usr/bin/git config --add remote.origin.fetch
+refs/heads/*:refs/remotes/origin/* # timeout=10
/usr/bin/git config remote.origin.url
https://git.linaro.org/lng/odp.git # timeout=10 Fetching upstream changes from https://git.linaro.org/lng/odp.git
/usr/bin/git fetch --tags --progress https://git.linaro.org/lng/odp.git
+refs/heads/master:refs/remotes/origin/master
/usr/bin/git rev-parse refs/remotes/origin/master^{commit} # timeout=10 /usr/bin/git rev-parse refs/remotes/origin/refs/heads/master^{commit} #
timeout=10 [YAD-PLUGIN] Injecting DOCKER_CONTAINER_ID variable. [YAD-PLUGIN] Injecting JENKINS_CLOUD_ID variable. [YAD-PLUGIN] DOCKER_HOST variable. Checking out Revision 783ca69b2f6e1ce1d7e2b2e2774d4d475a12cf10 (refs/remotes/origin/master)
/usr/bin/git config core.sparsecheckout # timeout=10 /usr/bin/git checkout -f 783ca69b2f6e1ce1d7e2b2e2774d4d475a12cf10 /usr/bin/git rev-list e819c669f474bba418c5897b6cdcf945da25c75e #
timeout=10 [YAD-PLUGIN] Injecting DOCKER_CONTAINER_ID variable. [YAD-PLUGIN] Injecting JENKINS_CLOUD_ID variable. [YAD-PLUGIN] DOCKER_HOST variable. Set build name. [YAD-PLUGIN] Injecting DOCKER_CONTAINER_ID variable. [YAD-PLUGIN] Injecting JENKINS_CLOUD_ID variable. [YAD-PLUGIN] DOCKER_HOST variable. New build name is '#365-783ca69b' [YAD-PLUGIN] Injecting DOCKER_CONTAINER_ID variable. [YAD-PLUGIN] Injecting JENKINS_CLOUD_ID variable. [YAD-PLUGIN] DOCKER_HOST variable. [build-odp-deb] $ /bin/bash /tmp/hudson1152301493648791461.sh
- wget -qO - http://deb.opendataplane.org/odp.key
- sudo apt-key add -
OK
- echo 'deb http://deb.opendataplane.org/ jessie main'
- sudo tee /etc/apt/sources.list.d/odp.list
deb http://deb.opendataplane.org/ jessie main
- sudo apt-get -q=2 update
- sudo apt-get -q=2 -y --no-install-recommends install debhelper
devscripts xz-utils
- pkg_source=odp
- cd odp
++ git describe --long '--match=v*' ++ cut -d- -f1 ++ sed -e 's/^v//'
- base_version=1.11.0.0_monarch
++ git describe --long '--match=v*' ++ sed -e 's/^v//' ++ cut -d- -f2
- nb_commit=103
++ git log -n1 --pretty=format:%h
- scm_commit=783ca69
- pkg_version=1.11.0.0_monarch+git103+783ca69
- pkg_dir=odp-1.11.0.0_monarch+git103+783ca69
- git config tar.tar.xz.command 'xz -c'
- git archive --format=tar.xz
--prefix=odp-1.11.0.0_monarch+git103+783ca69/ origin/master
- cd ..
- tar xf odp_1.11.0.0_monarch+git103+783ca69.orig.tar.xz
- packaging_dir=odp-packaging
- packaging_repository=https://git.linaro.org/lng/odp-packaging.git
- git clone -b master --depth 1
https://git.linaro.org/lng/odp-packaging.git Cloning into 'odp-packaging'... ++ cd odp-packaging ++ git log -n1 --pretty=format:%h
- packaging_commit=d9602db
- mv odp-packaging/pkg/debian odp-1.11.0.0_monarch+git103+783ca69
- rm -rf odp odp-packaging
- cd odp-1.11.0.0_monarch+git103+783ca69
- pkg_repository=https://git.linaro.org/lng/odp.git
++ date -R
- current_date='Wed, 30 Nov 2016 13:52:38 +0000'
- cat
- dpkg-buildpackage -d -nc -us -uc -rfakeroot -S -sa
parsechangelog/debian: warning: debian/changelog(l1): version '1.11.0.0_monarch+git103+783ca69-1' is invalid: version number contains illegal character `_' LINE: odp (1.11.0.0_monarch+git103+783ca69-1) unstable; urgency=medium dpkg-buildpackage: error: version number contains illegal character `_' dpkg-buildpackage: source package odp dpkg-buildpackage: source version 1.11.0.0_monarch+git103+783ca69-1 Build step 'Execute shell' marked build as failure Set build name. [YAD-PLUGIN] Injecting DOCKER_CONTAINER_ID variable. [YAD-PLUGIN] Injecting JENKINS_CLOUD_ID variable. [YAD-PLUGIN] DOCKER_HOST variable. New build name is '#365-783ca69b' Variable with name 'BUILD_DISPLAY_NAME' already exists, current value: '#365-783ca69b', new value: '#365-783ca69b' Archiving artifacts [YAD-PLUGIN] Injecting DOCKER_CONTAINER_ID variable. [YAD-PLUGIN] Injecting JENKINS_CLOUD_ID variable. [YAD-PLUGIN] DOCKER_HOST variable. [YAD-PLUGIN] Injecting DOCKER_CONTAINER_ID variable. [YAD-PLUGIN] Injecting JENKINS_CLOUD_ID variable. [YAD-PLUGIN] DOCKER_HOST variable. _______________________________________________ lng-ci mailing list lng-ci@lists.linaro.org https://lists.linaro.org/mailman/listinfo/lng-ci
-- Mike Holmes Program Manager - Linaro Networking Group Linaro.org │ Open source software for ARM SoCs "Work should be fun and collaborative, the rest follows"