Skip to content

Commit

Permalink
Minor fix
Browse files Browse the repository at this point in the history
  • Loading branch information
cpinjani committed Jul 9, 2023
1 parent d67efed commit 017a1ab
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ on:
required: true
type: string
default: cypress/browsers:node16.14.2-slim-chrome100-ff99-edge
cypress_test:
description: Scenario to test
rancher_version:
description: Rancher version to deploy
required: true
type: string

Expand All @@ -31,7 +31,7 @@ jobs:
KUBECONFIG: /etc/rancher/k3s/k3s.yaml
HELM_VERSION: 3.12.0
K3S_VERSION: v1.25.9+k3s1
RANCHER_VERSION: 2.7.5
RANCHER_VERSION: ${{ inputs.rancher_version }}
run: |
## Export information to other jobs
ETH_DEV=$(ip route | awk '/default via / { print $5 }')
Expand All @@ -53,7 +53,6 @@ jobs:
# container:
# image: ${{ inputs.cypress_image }}
# env:
# CLUSTER_NAME: local
# RANCHER_USER: admin
# RANCHER_PASSWORD: rancherpassword
# RANCHER_URL: https://${{ needs.installation.outputs.MY_IP }}
Expand All @@ -65,7 +64,7 @@ jobs:
# browser: ${{ inputs.browser }}
# # headless: true
# spec: |
# cypress/e2e/unit_tests/first_connexion.spec.ts
# cypress/e2e/unit_tests/first_connection.spec.ts
# cypress/e2e/unit_tests/${{ inputs.cypress_test }}
# config-file: cypress.config.ts

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ install-cert-manager:
install-rancher: ## Install Rancher via Helm
helm repo add rancher-latest https://releases.rancher.com/server-charts/latest
helm repo update
helm upgrade --install rancher rancher-latest/rancher --version ${RANCHER_VERSION}\
helm upgrade --install rancher rancher-latest/rancher --version ${RANCHER_VERSION} \
--namespace cattle-system \
--create-namespace \
--set global.cattle.psp.enabled=false \
Expand All @@ -36,7 +36,7 @@ install-rancher: ## Install Rancher via Helm
--wait
kubectl rollout status deployment rancher -n cattle-system --timeout=300s

prepare-e2e-ci-rancher: install-k3s install-helm install-cert-manager install-rancher## Tests
prepare-e2e-ci-rancher: install-k3s install-helm install-cert-manager install-rancher ## Tests

clean-k3s:
/usr/local/bin/k3s-uninstall.sh
Expand Down

0 comments on commit 017a1ab

Please sign in to comment.