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.

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

[docker-sonic-vs/Dockerfile.j2]: Install new YANG PKGs in VS docker. #68

Merged
merged 1 commit into from
Apr 27, 2020

Conversation

praveen-li
Copy link
Collaborator

@praveen-li praveen-li commented Apr 22, 2020

Changes:
. Install new YANG PKGs in VS docker.
. Install fixed version on other PY PKGs.

Signed-off-by: Praveen Chaudhary pchaudhary@linkedin.com

- What I did
Install new YANG PKGs in VS docker.

- How I did it
Added in packages in
$(DOCKER_SONIC_VS)_PYTHON_WHEELS += $(SONIC_YANG_MODELS_PY3)
$(DOCKER_SONIC_VS)_PYTHON_WHEELS += $(SONIC_YANG_MGMT_PY)

- How to verify it
At http://jinja.quantprogramming.com/

{% if docker_sonic_vs_whls.strip() %}
# copy all whl PKGs first,
{% for whl in docker_sonic_vs_whls.split(' ') -%}
COPY python-wheels/{{ whl }}  python-wheels/
{% endfor %}

# install PKGs after copying all PKGs to avoid dependency failure
# use py3 to find python3 package, which is forced by wheel as of now
{%- for whl in docker_sonic_vs_whls.split(' ') %}
{%- if 'py3' in whl %}
RUN pip3 install python-wheels/{{ whl }}
{% else -%}
RUN pip install python-wheels/{{ whl }}
{%- endif %}
{%- endfor %}
{% endif %}

Builds DEP PKGs at same time:

pchaudha@server05:/home/pchaudha/srcCode/dpb_repo$ ls -l target/docker-sonic-vs.gz.log
-rw-r--r-- 1 pchaudha pchaudha 35345 Apr 21 15:37 target/docker-sonic-vs.gz.log
pchaudha@server05:/home/pchaudha/srcCode/dpb_repo$ ls -l target/python-wheels/sonic_yang_m*
-rw-r--r-- 1 pchaudha pchaudha 13431 Apr 21 15:34 target/python-wheels/sonic_yang_mgmt-1.0-py2-none-any.whl
-rw-r--r-- 1 pchaudha pchaudha  4036 Apr 21 15:34 target/python-wheels/sonic_yang_mgmt-1.0-py2-none-any.whl.log
-rw-r--r-- 1 pchaudha pchaudha 13219 Apr 21 15:34 target/python-wheels/sonic_yang_models-1.0-py3-none-any.whl
-rw-r--r-- 1 pchaudha pchaudha   662 Apr 21 15:34 target/python-wheels/sonic_yang_models-1.0-py3-none-any.whl-install.log
-rw-r--r-- 1 pchaudha pchaudha 15225 Apr 21 15:34 target/python-wheels/sonic_yang_models-1.0-py3-none-any.whl.log

Installed

1338  ---> ee4aeae03107
1339 Step 68/95 : COPY python-wheels/sonic_yang_models-1.0-py3-none-any.whl  python-wheels/
1340  ---> 7c00d50ab8df
1341 Step 69/95 : COPY python-wheels/sonic_yang_mgmt-1.0-py2-none-any.whl  python-wheels/
1342  ---> e4fe41dd566c
1343 Step 70/95 : RUN pip3 install python-wheels/sonic_yang_models-1.0-py3-none-any.whl
1344  ---> Running in f80944aa9043
1345 Processing /python-wheels/sonic_yang_models-1.0-py3-none-any.whl
1346 Installing collected packages: sonic-yang-models
1347 Successfully installed sonic-yang-models-1.0
1348 Removing intermediate container f80944aa9043
1349  ---> 485c67df7190
1350 Step 71/95 : RUN pip install python-wheels/sonic_yang_mgmt-1.0-py2-none-any.whl
1351  ---> Running in afd023adb15a
1352 ^[[91mDEPRECATION: Python 2.7 reached the end of its life on January 1st, 2020. Please upgrade your Python as Python 2.7 is no longer ma     intained. A future version of pip will drop support for Python 2.7. More details about Python 2 support in pip, can be found at https://     pip.pypa.io/en/latest/development/release-process/#python-2-support
1353 ^[[0mProcessing /python-wheels/sonic_yang_mgmt-1.0-py2-none-any.whl
1354 Installing collected packages: sonic-yang-mgmt
1355 Successfully installed sonic-yang-mgmt-1.0
1356 Removing intermediate container afd023adb15a

Jenkins Test Results:
http://172.21.47.20:8080/job/DPB%20smoke%20test/53/console

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

Changes:
. Install new YANG PKGs in VS docker.
. Install fixed version on other PY PKGs.

Signed-off-by: Praveen Chaudhary pchaudhary@linkedin.com
@vasant17
Copy link
Collaborator

Could you please add the test cases run or at-least DPB config command executed without problem?

@praveen-li
Copy link
Collaborator Author

Could you please add the test cases run or at-least DPB config command executed without problem?

Done. Hope DBP smoke includes config breakout command.
http://172.21.47.20:8080/job/DPB%20smoke%20test/53/console

@vasant17 vasant17 self-requested a review April 27, 2020 19:34
@vasant17 vasant17 merged commit 8ec96b2 into zhenggen-xu:sonic-cfg-mgmt Apr 27, 2020
praveen-li pushed a commit to praveen-li/sonic-buildimage that referenced this pull request Mar 4, 2021
- Adding instructions to build telemetry server/go client inside docker (zhenggen-xu#68)
- Add RBAC, gNOI, API Versioning and Bulk Set operations. (zhenggen-xu#61) …
- Support NonTLS option for testing purpose only. (zhenggen-xu#67) …
- Oc gnmi examples (zhenggen-xu#62) …
praveen-li pushed a commit to praveen-li/sonic-buildimage that referenced this pull request May 14, 2021
- Adding instructions to build telemetry server/go client inside docker (zhenggen-xu#68)
- Add RBAC, gNOI, API Versioning and Bulk Set operations. (zhenggen-xu#61) …
- Support NonTLS option for testing purpose only. (zhenggen-xu#67) …
- Oc gnmi examples (zhenggen-xu#62) …
praveen-li pushed a commit to praveen-li/sonic-buildimage that referenced this pull request Aug 9, 2022
[master][sonic-linkmgrd] submodule updates

df51322 Longxiang Lyu   Fri May 6 10:01:46 2022 +0800   Add `ActiveActiveStateMachine` implementation (zhenggen-xu#64)
e721ceb Jing Zhang      Wed May 4 10:07:14 2022 -0700   Add doc for default route related changes  (zhenggen-xu#63)
7bb06fb Jing Zhang      Tue May 3 09:48:28 2022 -0700   Add Cli support to enable or disable default route related feature (zhenggen-xu#68)
e4b02cb Jing Zhang      Mon May 2 13:27:54 2022 -0700   Reset WaitActiveUp count before switching to active (zhenggen-xu#70)
212d960 Jing Zhang      Wed Apr 27 10:35:05 2022 -0700  lower log level to warning (zhenggen-xu#69)
48abc9e Jing Zhang      Thu Apr 14 16:50:04 2022 -0700  Add support to enable switchover time measurement (with link prober interval decreased to 10ms) feature  (zhenggen-xu#61)
c4858a6 Jing Zhang      Thu Apr 14 11:27:55 2022 -0700  Avoid proactively switching to `active` if default route is missing  (zhenggen-xu#62)

sign-off: Jing Zhang zhangjing@microsoft.com
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants