Skip to content

Commit

Permalink
CI: Update assumptions about latest published Helm chart version
Browse files Browse the repository at this point in the history
  • Loading branch information
consideRatio committed Oct 29, 2020
1 parent a55e2b4 commit 8337c94
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 19 deletions.
19 changes: 4 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,25 +103,14 @@ jobs:
- stage: test
name: chart:install-latest-then-upgrade
script:
## NOTE: To use Pebble in Travis CI, we require the ability to mount a
## certificate on the autohttps pod, but we can't because that
## configuration ability was added after 0.9.0. Due to this
## autohttps is disabled here.
## The current dev-config.yaml require network policies to contain
## more pre-defined defaults to reach the DNS server not present
## in 0.9.0, and are due to this disabled.
- |
helm install jupyterhub jupyterhub/jupyterhub --values dev-config.yaml \
--set proxy.https.enabled=false \
--set hub.networkPolicy.enabled=false \
--set proxy.networkPolicy.enabled=false \
--set singleuser.networkPolicy.enabled=false
# Install latest JupyterHub version from Helm chart repo
- helm install jupyterhub jupyterhub/jupyterhub --values dev-config.yaml
- await_jupyterhub
- await_autohttps_tls_cert_acquisition

# Upgrade JupyterHub to what's locally available
# Upgrade to local Helm chart
- helm upgrade jupyterhub ./jupyterhub --values dev-config.yaml
- await_jupyterhub
- await_autohttps_tls_cert_acquisition

# Run tests
- pytest --verbose --exitfirst ./tests || (full_namespace_report && exit 1)
Expand Down
3 changes: 1 addition & 2 deletions dev-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ proxy:
subPath: root-cert.pem
mountPath: /etc/pebble/root-cert.pem
extraEnv:
- name: LEGO_CA_CERTIFICATES
value: /etc/pebble/root-cert.pem
LEGO_CA_CERTIFICATES: /etc/pebble/root-cert.pem
chp:
resources:
requests:
Expand Down
3 changes: 1 addition & 2 deletions tools/templates/lint-and-validate-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,7 @@ proxy:
cpu: 200m
memory: 1Gi
extraEnv:
- name: LEGO_CA_CERTIFICATES
value: /etc/pebble/root-cert.pem
LEGO_CA_CERTIFICATES: /etc/pebble/root-cert.pem
nodeSelector:
node-type: mock
tolerations:
Expand Down

0 comments on commit 8337c94

Please sign in to comment.