Neale,

I agree that patching release branches for build infra changes is not the most desirable solution in general. However, there is also a strong desire to insulate the ci-management scripts from release specific knowledge to help reduce their complexity over the long term.

In general, the solution for this has been to store version specific information in well defined files in each repo. For example, the CSIT operational branch for each VPP branch is contained in vpp/build-root/scripts/csit-branch-version. Similar files are used in CSIT.

IMHO, this case is a one-off issue where the location of the scripts in the vagrant directory was not anticipated to be moved. Thus, the question at hand is whether it is worth permanently leaving the link in build-root/vagrant -> ../extras/vagrant, or apply the same restructuring to the stable/<release> branches.

My preference is the latter, but am willing to accept either solution.

Thanks,
-daw-

On 07/06/2017 01:08 PM, Neale Ranns (nranns) wrote:

Hi Dave,

I am concerned that these sort of changes to CI-mgnt will result in us requiring to patch all previous SW versions – this will only increase in pain levels in the future.

I would prefer it if the CI-mgnt system was aware of the VPP/CIST version is was building and could invoke the correct scripts accordingly.

Thanks,

neale

    *From: *<csit-dev-boun...@lists.fd.io> on behalf of Dave Wallace
    <dwallac...@gmail.com>
    *Date: *Thursday, 6 July 2017 at 17:43
    *To: *"Maciek Konstantynowicz (mkonstan)" <mkons...@cisco.com>
    *Cc: *"csit-...@lists.fd.io" <csit-...@lists.fd.io>,
    "vpp-dev@lists.fd.io" <vpp-dev@lists.fd.io>
    *Subject: *Re: [csit-dev] [vpp-dev] 17.07 CIST Failures : FW:
    Change in vpp[stable/1704]: DHCP complete event includes the
    subnet mask

    On 07/06/2017 12:32 PM, Maciek Konstantynowicz (mkonstan) wrote:

        Our emails crossed mid-air, so resending here.

        Your patchwork https://gerrit.fd.io/r/#/c/7457/

        Would need to applied to all stable VPP branches to make it work.

    Yes, my plan is to cherry-pick the patch to all of the release
    branches.

        Can’t we do it by keeping the symlink in place, and my patch ?

    Either will work, but I would prefer to this up now so we can
    remove build-root/vagrant in 17.10 (see other email response).

    Thanks,
    -daw-



        -Maciek

            On 6 Jul 2017, at 17:25, Maciek Konstantynowicz (mkonstan)
            <mkons...@cisco.com <mailto:mkons...@cisco.com>> 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:23, Dave Wallace
            <dwallac...@gmail.com <mailto:dwallac...@gmail.com>> wrote:

            Maciek,

            The vagrant directory is in the process of being moved
            from build-root/vagrant to extras/vagrant.  Instead of
            having to ping-pong this location multiple times in
            ci-management, I would recommend that fix the VPP stable
            branches to be compatible with the new location.  I have
            submitted a patch that is undergoing verification in vpp
            stable/1704 -- https://gerrit.fd.io/r/#/c/7457/

            Otherwise, your patch will need to be reverted in
            ci-management when build-root/vagrant is removed from master.

            Thanks,
            -daw-

            On 07/06/2017 12:16 PM, Maciek Konstantynowicz (mkonstan)
            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
                    <dwallac...@gmail.com
                    <mailto:dwallac...@gmail.com>> 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:vpp-dev-boun...@lists.fd.io
                        <mailto:vpp-dev-boun...@lists.fd.io>  
[mailto:vpp-dev-boun...@lists.fd.io] On Behalf Of Neale Ranns (nranns)

                        Sent: Thursday, July 06, 2017 12:57

                        To:csit-...@lists.fd.io <mailto:csit-...@lists.fd.io>

                        Cc: vpp-dev<vpp-dev@lists.fd.io> 
<mailto:vpp-dev@lists.fd.io>

                        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)"<ger...@fd.io> <mailto:ger...@fd.io>

                        Reply-To:"jobbuil...@projectrotterdam.info"
                        <mailto:jobbuil...@projectrotterdam.info>  
<jobbuil...@projectrotterdam.info>
                        <mailto:jobbuil...@projectrotterdam.info>

                        Date: Thursday, 6 July 2017 at 10:53

                        To: "Neale Ranns (nranns)"<nra...@cisco.com> 
<mailto:nra...@cisco.com>

                        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<nra...@cisco.com> 
<mailto:nra...@cisco.com>

                             Gerrit-Reviewer:fd.io <http://fd.io/>  
JJB<jobbuil...@projectrotterdam.info>
                        <mailto:jobbuil...@projectrotterdam.info>

                             Gerrit-HasComments: No

                        _______________________________________________

                        vpp-dev mailing list

                        vpp-dev@lists.fd.io <mailto:vpp-dev@lists.fd.io>

                        https://lists.fd.io/mailman/listinfo/vpp-dev

                        _______________________________________________

                        vpp-dev mailing list

                        vpp-dev@lists.fd.io <mailto:vpp-dev@lists.fd.io>

                        https://lists.fd.io/mailman/listinfo/vpp-dev

                    _______________________________________________
                    vpp-dev mailing list
                    vpp-dev@lists.fd.io <mailto:vpp-dev@lists.fd.io>
                    https://lists.fd.io/mailman/listinfo/vpp-dev


_______________________________________________
vpp-dev mailing list
vpp-dev@lists.fd.io
https://lists.fd.io/mailman/listinfo/vpp-dev

Reply via email to