Skip to content
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

Jump to bottom

improve github actions #515

Merged
merged 2 commits into from
Oct 9, 2023
+85 −61
Merged

improve github actions #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3241c2f
Speed up GitHub action runs and save resources
SchSeba Oct 2, 2023
41774fb
add networkManager to disable dhcp on vfs
SchSeba Oct 2, 2023
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
59 changes: 58 additions & 1 deletion .github/workflows/go.yml → .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
name: Go
name: Test SR-IOV Operator

on: [push, pull_request]

concurrency:
group: ${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:

build:
Expand Down Expand Up @@ -88,3 +92,56 @@ jobs:
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
path-to-lcov: lcov.out

virtual-k8s-cluster:
name: k8s
needs: [
build,
test,
golangci,
]
runs-on: [ sriov ]
steps:
- name: Check out code into the Go module directory
uses: actions/checkout@v2

- name: Set up Go 1.20
uses: actions/setup-go@v3
with:
go-version: 1.20.x

- name: run test
run: make test-e2e-conformance-virtual-k8s-cluster-ci

- uses: actions/upload-artifact@v3
if: always()
with:
name: k8s-artifact
path: ./k8s-artifacts

virtual-ocp:
name: ocp
needs: [
build,
test,
golangci,
]

runs-on: [ ocp ]
steps:
- name: Check out code into the Go module directory
uses: actions/checkout@v2

- name: Set up Go 1.20
uses: actions/setup-go@v3
with:
go-version: 1.20.x

- name: run test
run: make test-e2e-conformance-virtual-ocp-cluster-ci

- uses: actions/upload-artifact@v3
if: always()
with:
name: ocp-artifact
path: ./ocp-artifacts
45 changes: 0 additions & 45 deletions .github/workflows/virtual-cluster.yml
View file
Open in desktop

This file was deleted.

39 changes: 26 additions & 13 deletions hack/run-e2e-conformance-virtual-cluster.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,24 +126,38 @@ cat << EOF > /etc/containers/registries.conf.d/003-${cluster_name}.conf
$insecure_registry
EOF

kcli ssh $cluster_name-ctlplane-0 << EOF
function update_host() {
node_name=$1
kcli ssh $node_name << EOF
sudo su
echo '$insecure_registry' > /etc/containers/registries.conf.d/003-internal.conf
systemctl restart crio
EOF

kcli ssh $cluster_name-worker-0 << EOF
sudo su
echo '$insecure_registry' > /etc/containers/registries.conf.d/003-internal.conf
systemctl restart crio
EOF
echo '[connection]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: define function and call it for each node ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

id=multi
type=ethernet
[ethernet]
[match]
driver=igbvf;
[ipv4]
method=disabled
[ipv6]
addr-gen-mode=default
method=disabled
[proxy]' > /etc/NetworkManager/system-connections/multi.nmconnection

chmod 600 /etc/NetworkManager/system-connections/multi.nmconnection
systemctl restart NetworkManager

kcli ssh $cluster_name-worker-1 << EOF
sudo su
echo '$insecure_registry' > /etc/containers/registries.conf.d/003-internal.conf
systemctl restart crio
EOF

}

update_host $cluster_name-ctlplane-0
update_host $cluster_name-worker-0
update_host $cluster_name-worker-1


kubectl create namespace container-registry

echo "## deploy internal registry"
Expand Down Expand Up @@ -347,6 +361,5 @@ hack/deploy-wait.sh

if [ -z $SKIP_TEST ]; then
echo "## run sriov e2e conformance tests"
SUITE=./test/conformance JUNIT_OUTPUT=`pwd`/artifacts hack/run-e2e-conformance.sh
tar -zcvf artifacts.tar.gz ./artifacts
SUITE=./test/conformance JUNIT_OUTPUT=`pwd`/k8s-artifacts hack/run-e2e-conformance.sh
fi
3 changes: 1 addition & 2 deletions hack/run-e2e-conformance-virtual-ocp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,5 @@ hack/deploy-wait.sh

if [ -z $SKIP_TEST ]; then
echo "## run sriov e2e conformance tests"
SUITE=./test/conformance JUNIT_OUTPUT=`pwd`/artifacts hack/run-e2e-conformance.sh
tar -zcvf artifacts.tar.gz `pwd`/artifacts
SUITE=./test/conformance JUNIT_OUTPUT=`pwd`/ocp-artifacts hack/run-e2e-conformance.sh
fi
Loading