Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix env #769

Draft
wants to merge 13 commits into
base: master
Choose a base branch
from
Draft

Fix env #769

wants to merge 13 commits into from

Commits on Nov 24, 2022

  1. Don't install python-swsscommon in docker-sonic-vs 

    This is in preparation for docker-sonic-vs being upgraded to Bullseye,
where Python 2 is no longer available.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
    @saiarcot895
    saiarcot895 committed Nov 24, 2022
    Configuration menu
    Copy the full SHA
    fb3574e View commit details
    Browse the repository at this point in the history

  2. Change AzP to build for Bullseye only 

    Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
    @saiarcot895
    saiarcot895 committed Nov 24, 2022
    Configuration menu
    Copy the full SHA
    cec1a08 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2022

  1. Don't install python-swsscommon_*.deb. 

    Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
    @saiarcot895
    saiarcot895 committed Nov 27, 2022
    Configuration menu
    Copy the full SHA
    87f5077 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2022

  1. Merge remote-tracking branch 'origin/master' into bullseye-docker-son… 

    …ic-vs
    @saiarcot895
    saiarcot895 committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    37fcdbd View commit details
    Browse the repository at this point in the history

  2. Use pytest-3 instead of pytest 

    Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
    @saiarcot895
    saiarcot895 committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    5d46a4f View commit details
    Browse the repository at this point in the history

  3. Clean up build rules to only support Bullseye builds 

    Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
    @saiarcot895
    saiarcot895 committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    bc7b119 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2022

  1. Update Microsoft repo URL for Bullseye 

    Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
    @saiarcot895
    saiarcot895 committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    510b43f View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2023

  1. Merge remote-tracking branch 'origin/master' into bullseye-docker-son… 

    …ic-vs
    @saiarcot895
    saiarcot895 committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    1fbb507 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2023

  1. Merge remote-tracking branch 'origin/master' into bullseye-docker-son… 

    …ic-vs
    @saiarcot895
    saiarcot895 committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    35eaff7 View commit details
    Browse the repository at this point in the history

  2. Fix sairedis build for Bullseye 

    Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
    @saiarcot895
    saiarcot895 committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    b26c0bb View commit details
    Browse the repository at this point in the history

  3. Fix swss build. 

    Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
    @saiarcot895
    saiarcot895 committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    bdb85ec View commit details
    Browse the repository at this point in the history

  4. Temporarily bump up time limit for sairedis build 

    Looks like the C++ code generated by SWIG 4.0 takes much longer to
compile than the C++ code generated by SWIG 3.0 for some reason. For
this reason, bump up the time limit for the sairedis build to 90
minutes.

There's some fixes that can be done on the sairedis side, but that needs
swss-common to be properly building.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
    @saiarcot895
    saiarcot895 committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    3a366e2 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2023

  1. Replace deb packages instead of remove and install 

    In updating docker-sonic-vs, instead of removing the existing packages
first and then installing the current version of packages, just replace
the existing deb packages. This gets around a dependency issue due to
sonic-eventd being in the docker-config-engine-bullseye layer.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
    @saiarcot895
    saiarcot895 committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    e1506de View commit details
    Browse the repository at this point in the history