Maciek,
My patch replicates the movement of the directory and adds the link in
build-root/vagrant for backwards compatibility in the stable branches,
so that we can remove the link in build-root/vagrant in master.
I'd prefer that we clean this up now and make build-root/vagrant go away
in 17.10, but I'm willing to leave it in place if that is what the
community desires.
Thanks,
-daw-
On 07/06/2017 12:25 PM, Maciek Konstantynowicz (mkonstan) wrote:
https://gerrit.fd.io/r/#/c/7459/
This should make it compatible for all branches IMV, as there is
symbolic link in the right place, so no need to change:
build-root $ ls -la | grep vagrant
lrwxr-xr-x 1 maciek staff 17 6 Jul 16:48 vagrant ->
../extras/vagrant
Whoever move the directory back on 20-Apr thought about the cases like
this :)
-Maciek
On 6 Jul 2017, at 17:16, Maciek Konstantynowicz (mkonstan)
<[email protected] <mailto:[email protected]>> wrote:
Dave, Looks like we’ve been working on this in parallel.
This is the fix, yes:
diff --git a/jjb/vpp/include-raw-vpp-build.sh
b/jjb/vpp/include-raw-vpp-build.sh
index 5e603d2..582971c 100644
--- a/jjb/vpp/include-raw-vpp-build.sh
+++ b/jjb/vpp/include-raw-vpp-build.sh
@@ -32,16 +32,16 @@ echo "CC=${CC}"
echo "IS_CSIT_VPP_JOB=${IS_CSIT_VPP_JOB}"
# If and only if we are doing verify *after* make verify was made to
work
# and we are not a CSIT job just building packages, then use make
verify,
-# else use the old extras/vagrant/build.sh
+# else use the old build-root/vagrant/build.sh
if (git log --oneline | grep 37682e1 > /dev/null 2>&1) && \
[ "x${IS_CSIT_VPP_JOB}" != "xTrue" ]
then
echo "Building using \"make verify\""
[ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes verify
else
- echo "Building using \"make extras/vagrant/build.sh\""
+ echo "Building using \"make build-root/vagrant/build.sh\""
[ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes dpdk-install-dev
- [ "x${DRYRUN}" == "xTrue" ] || extras/vagrant/build.sh
+ [ "x${DRYRUN}" == "xTrue" ] || build-root/vagrant/build.sh
fi
if [ "x${VPP_REPO}" == "x1" ]; then
-Maciek
On 6 Jul 2017, at 16:17, Dave Wallace <[email protected]
<mailto:[email protected]>> wrote:
This is a side effect of a change made to ci-management
(https://gerrit.fd.io/r/#/c/7173/).
I will fix this issue for the stable vpp branches.
Thanks,
-daw-
On 7/6/17 8:22 AM, Jan Gelety -X (jgelety - PANTHEON TECHNOLOGIES at
Cisco) wrote:
Hello Neale,
If I am correct, it is necessary to move/copy vagrant directory from
build-root/vagrant/ to extras/vagrant/ in stable/1704 branch.
Probably it should be done for all stable vpp branches.
Regards,
Jan
-----Original Message-----
From:[email protected] [mailto:[email protected]] On
Behalf Of Neale Ranns (nranns)
Sent: Thursday, July 06, 2017 12:57
To:[email protected]
Cc: vpp-dev<[email protected]>
Subject: [vpp-dev] 17.07 CIST Failures : FW: Change in vpp[stable/1704]: DHCP
complete event includes the subnet mask
Hi all,
The CSIT jobs on 17.07 have a consistent failure as of some time last night –
error below.
Could I please ask for an investigation as a matter of some urgency.
Thanks,
Neale
08:42:24 make[1]: Entering directory '/w/workspace/vpp-csit-verify-virl-1704/dpdk'
08:42:24 Makefile:170: warning: overriding recipe for target
'/w/workspace/vpp-csit-verify-virl-1704/dpdk/'
08:42:24 Makefile:164: warning: ignoring old recipe for target
'/w/workspace/vpp-csit-verify-virl-1704/dpdk/'
08:42:25 ==========================================================
08:42:25 Up-to-date DPDK package already installed
08:42:25 ==========================================================
08:42:25 make[1]: Leaving directory
'/w/workspace/vpp-csit-verify-virl-1704/dpdk'
08:42:25 + '[' x == xTrue ']'
08:42:25 + extras/vagrant/build.sh
08:42:25 /tmp/hudson5219485721951253061.sh: line 89: extras/vagrant/build.sh:
No such file or directory
-----Original Message-----
From: "fd.io <http://fd.io/> JJB (Code Review)"<[email protected]>
Reply-To:"[email protected]" <[email protected]>
Date: Thursday, 6 July 2017 at 10:53
To: "Neale Ranns (nranns)"<[email protected]>
Subject: Change in vpp[stable/1704]: DHCP complete event includes the subnet
mask
fd.io <http://fd.io/> JJB has posted comments on this change.
(https://gerrit.fd.io/r/7426 )
Change subject: DHCP complete event includes the subnet mask
......................................................................
Patch Set 3: Verified-1
Build Failed
https://jenkins.fd.io/job/vpp-csit-verify-virl-1704/167/ : FAILURE
No problems were identified. If you know why this problem occurred, please add a suitable Cause for it. (https://jenkins.fd.io/job/vpp-csit-verify-virl-1704/167/ )
Logs:https://logs.fd.io/production/vex-yul-rot-jenkins-1/vpp-csit-verify-virl-1704/167
https://jenkins.fd.io/job/vpp-verify-1704-centos7/168/ : FAILURE
No problems were identified. If you know why this problem occurred, please add a suitable Cause for it. (https://jenkins.fd.io/job/vpp-verify-1704-centos7/168/ )
Logs:https://logs.fd.io/production/vex-yul-rot-jenkins-1/vpp-verify-1704-centos7/168
https://jenkins.fd.io/job/vpp-docs-verify-1704/167/ : SUCCESS
Logs:https://logs.fd.io/production/vex-yul-rot-jenkins-1/vpp-docs-verify-1704/167
https://jenkins.fd.io/job/vpp-make-test-docs-verify-1704/167/ : SUCCESS
Logs:https://logs.fd.io/production/vex-yul-rot-jenkins-1/vpp-make-test-docs-verify-1704/167
https://jenkins.fd.io/job/vpp-verify-1704-ubuntu1604/167/ : SUCCESS
Logs:https://logs.fd.io/production/vex-yul-rot-jenkins-1/vpp-verify-1704-ubuntu1604/167
--
To view, visithttps://gerrit.fd.io/r/7426
To unsubscribe, visithttps://gerrit.fd.io/r/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ia603fec7a769dd947c58b73ec8502e34906cc4b3
Gerrit-PatchSet: 3
Gerrit-Project: vpp
Gerrit-Branch: stable/1704
Gerrit-Owner: Neale Ranns<[email protected]>
Gerrit-Reviewer:fd.io <http://fd.io/>
JJB<[email protected]>
Gerrit-HasComments: No
_______________________________________________
vpp-dev mailing list
[email protected]
https://lists.fd.io/mailman/listinfo/vpp-dev
_______________________________________________
vpp-dev mailing list
[email protected]
https://lists.fd.io/mailman/listinfo/vpp-dev
_______________________________________________
vpp-dev mailing list
[email protected] <mailto:[email protected]>
https://lists.fd.io/mailman/listinfo/vpp-dev
_______________________________________________
vpp-dev mailing list
[email protected]
https://lists.fd.io/mailman/listinfo/vpp-dev