Skip to content
Snippets Groups Projects
Commit 48477fc7 authored by Maarten de Waard's avatar Maarten de Waard :angel:
Browse files

Merge branch 'update_chromium' into 'master'

Update chromium in CI image

See merge request openappstack/openappstack!449
parents b1d7bd1a e065ba01
No related branches found
No related tags found
No related merge requests found
......@@ -2,19 +2,16 @@
## Changes to do on the master branch before releasing
Create a MR for the master branch with the following changes:
* [ ] Create a MR for the master branch for the following changes:
* update/review `docs/*` and make sure it matches the current state
* [ ] Update how to checkout the latest stable tag
* [ ] Document how to upgrade in `docs/upgrade.md`
* [ ] Update dependencies in `requirements-stable.txt`
1. Create a new `virtualenv` and activate it
2. Run `pip3 install -r requirements.txt`
3. Run `pip3 freeze > requirements-stable.txt`
* [ ] Update dependencies in `requirements-stable.txt` by following the
instructions in `requirements.in`
* [ ] update [CHANGELOG.md](https://keepachangelog.com/en/1.0.0/)
* Include `Known issues`
* [ ] Include `Known issues`
* [ ] update the version number in the `VERSION` file
* [ ] commit (signed)
* [ ] commit (signed)
* [ ] Push to MR
* [ ] Wait for MR to get merged into master
......
......@@ -17,7 +17,7 @@ RUN \
apk --no-cache add \
bash=~5.1.4-r0 \
cargo=~1.52.0-r0 \
chromium=~91.0.4472.101-r0 \
chromium=~91.0.4472.114-r0 \
curl=~7.77.0-r1 \
# needed for installing pycurl python module
curl-dev=~7.77.0-r1 \
......@@ -36,7 +36,7 @@ RUN \
mkdir /var/cache/apk && \
chmod a+x /usr/local/bin/* && \
update-ca-certificates && \
pip install --no-cache-dir -r /requirements.txt && \
pip install --no-cache-dir --ignore-installed six -r /requirements.txt && \
ln -s /usr/bin/python3 /usr/bin/python && \
tar -xzf /tmp/flux*.tar.gz && mv ./flux /usr/local/bin && \
npm install -g taiko@1.2.5
......@@ -15,6 +15,7 @@
ansible<2.10
# needed for test_dns.py
dnspython
kubernetes
# Needed for testinfra using the ansible module
paramiko
psutil
......
......@@ -12,8 +12,12 @@ attrs==21.2.0
# via pytest
bcrypt==3.2.0
# via paramiko
cachetools==4.2.2
# via google-auth
certifi==2021.5.30
# via requests
# via
# kubernetes
# requests
cffi==1.14.6
# via
# bcrypt
......@@ -28,14 +32,20 @@ cryptography==3.4.7
# pyopenssl
dnspython==2.1.0
# via -r requirements.in
google-auth==1.32.1
# via kubernetes
idna==3.2
# via requests
iniconfig==1.1.1
# via pytest
jinja2==3.0.1
# via ansible
kubernetes==17.17.0
# via -r requirements.in
markupsafe==2.0.1
# via jinja2
oauthlib==3.1.1
# via requests-oauthlib
packaging==21.0
# via pytest
paramiko==2.7.2
......@@ -48,6 +58,12 @@ psutil==5.8.0
# via -r requirements.in
py==1.10.0
# via pytest
pyasn1==0.4.8
# via
# pyasn1-modules
# rsa
pyasn1-modules==0.2.8
# via google-auth
pycparser==2.20
# via cffi
pynacl==1.4.0
......@@ -64,17 +80,31 @@ pytest-rerunfailures==10.1
# via -r requirements.in
pytest-testinfra==6.4.0
# via -r requirements.in
python-dateutil==2.8.2
# via kubernetes
pytz==2021.1
# via greenhost-cloud
pyyaml==5.4.1
# via ansible
# via
# ansible
# kubernetes
requests==2.26.0
# via greenhost-cloud
# via
# greenhost-cloud
# kubernetes
# requests-oauthlib
requests-oauthlib==1.3.0
# via kubernetes
rsa==4.7.2
# via google-auth
six==1.16.0
# via
# bcrypt
# google-auth
# kubernetes
# pynacl
# pyopenssl
# python-dateutil
tabulate==0.8.9
# via greenhost-cloud
tld==0.12.6
......@@ -82,7 +112,11 @@ tld==0.12.6
toml==0.10.2
# via pytest
urllib3==1.26.6
# via requests
# via
# kubernetes
# requests
websocket-client==1.1.0
# via kubernetes
wheel==0.36.2
# via -r requirements.in
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment