Skip to content

Cleanup additional space and stop removing swap #2

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.

Sign up for GitHub

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

Open
mangelajo wants to merge 3 commits into
base: kind-ovn
Choose a base branch
from
Open

Cleanup additional space and stop removing swap #2

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b71d43
Enable OVN CNI
vthapar Jan 13, 2021
276d714
Cleanup additional space and stop removing swap
mangelajo Jan 25, 2021
3e204b0
Apply suggestions from code review
mangelajo Jan 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions .github/workflows/e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,19 @@ jobs:
deploytool: ['operator', 'helm']
globalnet: ['', 'globalnet']
cable_driver: ['libreswan', 'strongswan', 'wireguard']
ovn: ['', 'ovn']
exclude:
# Our Helm setup doesn’t know how to deploy other cable drivers
- deploytool: 'helm'
cable_driver: 'wireguard'
- deploytool: 'helm'
cable_driver: 'libreswan'
- ovn: 'ovn'
deploytool: 'helm'
- ovn: 'ovn'
globalnet: 'globalnet'
- ovn: 'ovn'
cable_driver: 'strongswan'
steps:
- name: Check out the repository
uses: actions/checkout@v2
Expand All @@ -33,14 +40,14 @@ jobs:

- name: Reclaim free space
run: |
sudo swapoff -a
sudo rm -f /swapfile
# cleanup 30GB+ of tools we don't need for our CI
Comment thread
mangelajo marked this conversation as resolved.
Outdated
rm -rf /opt/ghc /usr/share/dotnet /usr/share/swift
df -h
free -h

- name: Run E2E deployment and tests
run: |
make e2e using="${{ matrix.globalnet }} ${{ matrix.deploytool }} ${{ matrix.cable_driver }}"
make e2e using="${{ matrix.globalnet }} ${{ matrix.deploytool }} ${{ matrix.cable_driver }} ${{ matrix.ovn }}"

- name: Post mortem
if: failure()
Expand Down
6 changes: 6 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,13 @@ include $(SHIPYARD_DIR)/Makefile.inc

TARGETS := $(shell ls -p scripts | grep -v -e / -e reload-images)
override BUILD_ARGS += $(shell source ${SCRIPTS_DIR}/lib/version; echo --ldflags \'-X main.VERSION=$${VERSION}\')

ifneq (,$(filter ovn,$(_using)))
override CLUSTERS_ARGS += --cluster_settings $(DAPPER_SOURCE)/scripts/cluster_settings.ovn
else
override CLUSTERS_ARGS += --cluster_settings $(DAPPER_SOURCE)/scripts/cluster_settings
endif

override E2E_ARGS += --focus $(focus) cluster2 cluster3 cluster1
override UNIT_TEST_ARGS += test/e2e
override VALIDATE_ARGS += --skip-dirs pkg/client
Expand Down
6 changes: 6 additions & 0 deletions scripts/cluster_settings.ovn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Specific settings for the submariner E2E
cluster_nodes['cluster1']="control-plane worker"
cluster_nodes['cluster2']="control-plane worker worker"
cluster_nodes['cluster3']="control-plane worker worker"

cluster_cni=( ['cluster1']="ovn" ['cluster2']="ovn" ['cluster3']="ovn" )