Skip to content

Commit

Permalink
build,tests: Bump salt to 3001.3
Browse files Browse the repository at this point in the history
  • Loading branch information
TeddyAndrieux committed Nov 17, 2020
1 parent 59edec2 commit 1ca977e
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 29 deletions.
2 changes: 1 addition & 1 deletion buildchain/buildchain/versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

CALICO_VERSION : str = '3.16.1'
K8S_VERSION : str = '1.18.10'
SALT_VERSION : str = '3000.5'
SALT_VERSION : str = '3001.3'
CONTAINERD_VERSION : str = '1.4.1'
CONTAINERD_RELEASE : str = '1.el7'

Expand Down
2 changes: 1 addition & 1 deletion images/salt-master/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM centos:7.6.1810
MAINTAINER moonshot-platform <moonshot-platform@scality.com>

# Versions to use
ARG SALT_VERSION=3000.5
ARG SALT_VERSION=3001.3

# Install saltstack
RUN printf "[saltstack-repo]\n\
Expand Down
2 changes: 1 addition & 1 deletion salt/tests/requirements.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pytest
pytest-cov
salt == 3000.5
salt == 3002.1
mock == 3.0.5
parameterized == 0.7.4
etcd3 != 0.11.0
Expand Down
87 changes: 61 additions & 26 deletions salt/tests/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ coverage==5.3 \
--hash=sha256:cedb2f9e1f990918ea061f28a0f0077a07702e3819602d3507e2ff98c8d20636 \
--hash=sha256:e8caf961e1b1a945db76f1b5fa9c91498d15f545ac0ababbe575cfab185d3bd8 \
# via pytest-cov
distro==1.5.0 \
--hash=sha256:0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92 \
--hash=sha256:df74eed763e18d10d0da624258524ae80486432cd17392d9c3d96f5e83cd2799 \
# via salt
etcd3==0.12.0 \
--hash=sha256:89a704cb389bf0a010a1fa050ce19342d23bf6371ebda1c21cfe8ff3ed488726
google-auth==1.23.0 \
Expand Down Expand Up @@ -167,28 +171,25 @@ markupsafe==1.1.1 \
mock==3.0.5 \
--hash=sha256:83657d894c90d5681d62155c82bda9c1187827525880eda8ff5df4ec813437c3 \
--hash=sha256:d157e52d4e5b938c550f39eb2fd15610db062441a9c2747d3dbfa9298211d0f8
msgpack==0.6.2 \
--hash=sha256:0cc7ca04e575ba34fea7cfcd76039f55def570e6950e4155a4174368142c8e1b \
--hash=sha256:187794cd1eb73acccd528247e3565f6760bd842d7dc299241f830024a7dd5610 \
--hash=sha256:1904b7cb65342d0998b75908304a03cb004c63ef31e16c8c43fee6b989d7f0d7 \
--hash=sha256:229a0ccdc39e9b6c6d1033cd8aecd9c296823b6c87f0de3943c59b8bc7c64bee \
--hash=sha256:24149a75643aeaa81ece4259084d11b792308a6cf74e796cbb35def94c89a25a \
--hash=sha256:30b88c47e0cdb6062daed88ca283b0d84fa0d2ad6c273aa0788152a1c643e408 \
--hash=sha256:32fea0ea3cd1ef820286863a6202dcfd62a539b8ec3edcbdff76068a8c2cc6ce \
--hash=sha256:355f7fd0f90134229eaeefaee3cf42e0afc8518e8f3cd4b25f541a7104dcb8f9 \
--hash=sha256:4abdb88a9b67e64810fb54b0c24a1fd76b12297b4f7a1467d85a14dd8367191a \
--hash=sha256:757bd71a9b89e4f1db0622af4436d403e742506dbea978eba566815dc65ec895 \
--hash=sha256:76df51492bc6fa6cc8b65d09efdb67cbba3cbfe55004c3afc81352af92b4a43c \
--hash=sha256:774f5edc3475917cd95fe593e625d23d8580f9b48b570d8853d06cac171cd170 \
--hash=sha256:8a3ada8401736df2bf497f65589293a86c56e197a80ae7634ec2c3150a2f5082 \
--hash=sha256:a06efd0482a1942aad209a6c18321b5e22d64eb531ea20af138b28172d8f35ba \
--hash=sha256:b24afc52e18dccc8c175de07c1d680bdf315844566f4952b5bedb908894bec79 \
--hash=sha256:b8b4bd3dafc7b92608ae5462add1c8cc881851c2d4f5d8977fdea5b081d17f21 \
--hash=sha256:c6e5024fc0cdf7f83b6624850309ddd7e06c48a75fa0d1c5173de4d93300eb19 \
--hash=sha256:db7ff14abc73577b0bcbcf73ecff97d3580ecaa0fc8724babce21fdf3fe08ef6 \
--hash=sha256:dedf54d72d9e7b6d043c244c8213fe2b8bbfe66874b9a65b39c4cc892dd99dd4 \
--hash=sha256:ea3c2f859346fcd55fc46e96885301d9c2f7a36d453f5d8f2967840efa1e1830 \
--hash=sha256:f0f47bafe9c9b8ed03e19a100a743662dd8c6d0135e684feea720a0d0046d116 \
msgpack==1.0.0 \
--hash=sha256:002a0d813e1f7b60da599bdf969e632074f9eec1b96cbed8fb0973a63160a408 \
--hash=sha256:25b3bc3190f3d9d965b818123b7752c5dfb953f0d774b454fd206c18fe384fb8 \
--hash=sha256:271b489499a43af001a2e42f42d876bb98ccaa7e20512ff37ca78c8e12e68f84 \
--hash=sha256:39c54fdebf5fa4dda733369012c59e7d085ebdfe35b6cf648f09d16708f1be5d \
--hash=sha256:4233b7f86c1208190c78a525cd3828ca1623359ef48f78a6fea4b91bb995775a \
--hash=sha256:5bea44181fc8e18eed1d0cd76e355073f00ce232ff9653a0ae88cb7d9e643322 \
--hash=sha256:5dba6d074fac9b24f29aaf1d2d032306c27f04187651511257e7831733293ec2 \
--hash=sha256:7a22c965588baeb07242cb561b63f309db27a07382825fc98aecaf0827c1538e \
--hash=sha256:908944e3f038bca67fcfedb7845c4a257c7749bf9818632586b53bcf06ba4b97 \
--hash=sha256:9534d5cc480d4aff720233411a1f765be90885750b07df772380b34c10ecb5c0 \
--hash=sha256:aa5c057eab4f40ec47ea6f5a9825846be2ff6bf34102c560bad5cad5a677c5be \
--hash=sha256:b3758dfd3423e358bbb18a7cccd1c74228dffa7a697e5be6cb9535de625c0dbf \
--hash=sha256:c901e8058dd6653307906c5f157f26ed09eb94a850dddd989621098d347926ab \
--hash=sha256:cec8bf10981ed70998d98431cd814db0ecf3384e6b113366e7f36af71a0fca08 \
--hash=sha256:db685187a415f51d6b937257474ca72199f393dad89534ebbdd7d7a3b000080e \
--hash=sha256:e35b051077fc2f3ce12e7c6a34cf309680c63a842db3a0616ea6ed25ad20d272 \
--hash=sha256:e7bbdd8e2b277b77782f3ce34734b0dfde6cbe94ddb74de8d733d603c7f9e2b1 \
--hash=sha256:ea41c9219c597f1d2bf6b374d951d310d58684b5de9dc4bd2976db9e1e22c140 \
# via salt
oauthlib==3.1.0 \
--hash=sha256:bee41cc35fcca6e988463cacc3bcb8a96224f470ca547e697b604cc697b2f889 \
Expand Down Expand Up @@ -237,8 +238,42 @@ pyasn1==0.4.8 \
--hash=sha256:39c7e2ec30515947ff4e87fb6f456dfc6e84857d34be479c9d4a4ba4bf46aa5d \
--hash=sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba \
# via pyasn1-modules, rsa
pycrypto==2.6.1 \
--hash=sha256:f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c \
pycryptodomex==3.9.9 \
--hash=sha256:15c03ffdac17731b126880622823d30d0a3cc7203cd219e6b9814140a44e7fab \
--hash=sha256:20fb7f4efc494016eab1bc2f555bc0a12dd5ca61f35c95df8061818ffb2c20a3 \
--hash=sha256:28ee3bcb4d609aea3040cad995a8e2c9c6dc57c12183dadd69e53880c35333b9 \
--hash=sha256:305e3c46f20d019cd57543c255e7ba49e432e275d7c0de8913b6dbe57a851bc8 \
--hash=sha256:3547b87b16aad6afb28c9b3a9cd870e11b5e7b5ac649b74265258d96d8de1130 \
--hash=sha256:3642252d7bfc4403a42050e18ba748bedebd5a998a8cba89665a4f42aea4c380 \
--hash=sha256:404faa3e518f8bea516aae2aac47d4d960397199a15b4bd6f66cad97825469a0 \
--hash=sha256:42669638e4f7937b7141044a2fbd1019caca62bd2cdd8b535f731426ab07bde1 \
--hash=sha256:4632d55a140b28e20be3cd7a3057af52fb747298ff0fd3290d4e9f245b5004ba \
--hash=sha256:4a88c9383d273bdce3afc216020282c9c5c39ec0bd9462b1a206af6afa377cf0 \
--hash=sha256:4ce1fc1e6d2fd2d6dc197607153327989a128c093e0e94dca63408f506622c3e \
--hash=sha256:55cf4e99b3ba0122dee570dc7661b97bf35c16aab3e2ccb5070709d282a1c7ab \
--hash=sha256:5e486cab2dfcfaec934dd4f5d5837f4a9428b690f4d92a3b020fd31d1497ca64 \
--hash=sha256:65ec88c8271448d2ea109d35c1f297b09b872c57214ab7e832e413090d3469a9 \
--hash=sha256:6c95a3361ce70068cf69526a58751f73ddac5ba27a3c2379b057efa2f5338c8c \
--hash=sha256:73240335f4a1baf12880ebac6df66ab4d3a9212db9f3efe809c36a27280d16f8 \
--hash=sha256:7651211e15109ac0058a49159265d9f6e6423c8a81c65434d3c56d708417a05b \
--hash=sha256:7b5b7c5896f8172ea0beb283f7f9428e0ab88ec248ce0a5b8c98d73e26267d51 \
--hash=sha256:836fe39282e75311ce4c38468be148f7fac0df3d461c5de58c5ff1ddb8966bac \
--hash=sha256:871852044f55295449fbf225538c2c4118525093c32f0a6c43c91bed0452d7e3 \
--hash=sha256:892e93f3e7e10c751d6c17fa0dc422f7984cfd5eb6690011f9264dc73e2775fc \
--hash=sha256:934e460c5058346c6f1d62fdf3db5680fbdfbfd212722d24d8277bf47cd9ebdc \
--hash=sha256:9736f3f3e1761024200637a080a4f922f5298ad5d780e10dbb5634fe8c65b34c \
--hash=sha256:a1d38a96da57e6103423a446079ead600b450cf0f8ebf56a231895abf77e7ffc \
--hash=sha256:a385fceaa0cdb97f0098f1c1e9ec0b46cc09186ddf60ec23538e871b1dddb6dc \
--hash=sha256:a7cf1c14e47027d9fb9d26aa62e5d603994227bd635e58a8df4b1d2d1b6a8ed7 \
--hash=sha256:a9aac1a30b00b5038d3d8e48248f3b58ea15c827b67325c0d18a447552e30fc8 \
--hash=sha256:b696876ee583d15310be57311e90e153a84b7913ac93e6b99675c0c9867926d0 \
--hash=sha256:bef9e9d39393dc7baec39ba4bac6c73826a4db02114cdeade2552a9d6afa16e2 \
--hash=sha256:c885fe4d5f26ce8ca20c97d02e88f5fdd92c01e1cc771ad0951b21e1641faf6d \
--hash=sha256:d2d1388595cb5d27d9220d5cbaff4f37c6ec696a25882eb06d224d241e6e93fb \
--hash=sha256:d2e853e0f9535e693fade97768cf7293f3febabecc5feb1e9b2ffdfe1044ab96 \
--hash=sha256:d62fbab185a6b01c5469eda9f0795f3d1a5bba24f5a5813f362e4b73a3c4dc70 \
--hash=sha256:f20a62397e09704049ce9007bea4f6bad965ba9336a760c6f4ef1b4192e12d6d \
--hash=sha256:f81f7311250d9480e36dec819127897ae772e7e8de07abfabe931b8566770b8e \
# via salt
pyparsing==2.4.7 \
--hash=sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1 \
Expand Down Expand Up @@ -308,8 +343,8 @@ rsa==4.6 \
--hash=sha256:109ea5a66744dd859bf16fe904b8d8b627adafb9408753161e766a92e7d681fa \
--hash=sha256:6166864e23d6b5195a5cfed6cd9fed0fe774e226d8f854fcb23b7bbef0350233 \
# via google-auth
salt==3000.5 \
--hash=sha256:486310fca787eecbb0dd04d71af9ac0a163607f81719f815f8d4daa1c2b71bff
salt==3002.1 \
--hash=sha256:4c536a0577c9fe5052fa80c25c93527af00b50086aba0f5320e46dcd1dc3e75e
six==1.15.0 \
--hash=sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259 \
--hash=sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced \
Expand Down

0 comments on commit 1ca977e

Please sign in to comment.