Skip to content

Commit 7580926

Browse files
zohar7chzohar7ch
committed
Extract common e2e logic to a different github action
1 parent 06f15b3 commit 7580926

File tree

2 files changed

+120
-88
lines changed

2 files changed

+120
-88
lines changed

‎.github/workflows/e2e-test-setpup-action.yaml‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
name: E2E Setup
2+
description: This workflow is used to set up the environment for the E2E tests.
3+
on:
4+
workflow_call:
5+
inputs:
6+
mapper-tag:
7+
required: true
8+
type: string
9+
sniffer-tag:
10+
required: true
11+
type: string
12+
mapper-image:
13+
required: true
14+
type: string
15+
sniffer-image:
16+
required: true
17+
type: string
18+
registry:
19+
required: true
20+
type: string
21+
default: us-central1-docker.pkg.dev/main-383408/otterize
22+
jobs:
23+
steps:
24+
- name: Checkout
25+
uses: actions/checkout@v2
26+
with:
27+
submodules: recursive
28+
29+
- name: Start minikube
30+
uses: medyagh/setup-minikube@master
31+
with:
32+
start-args: "--network-plugin=cni --cni=calico"
33+
34+
- name: Load images from GitHub Artifacts
35+
if: github.repository != 'otterize/network-mapper' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != 'otterize/network-mapper')
36+
uses: actions/download-artifact@v4
37+
with:
38+
name: ${{ env.REGISTRY }}_${{ github.actor }}_mapper_${{ github.sha }}.tar
39+
40+
- name: Load Docker image
41+
if: github.repository != 'otterize/network-mapper' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != 'otterize/network-mapper')
42+
run: |-
43+
docker image load -i mapper.tar
44+
minikube image load ${{ env.REGISTRY }}/${{ github.actor }}/mapper:${{ github.sha }}
45+
46+
- name: Load images from GitHub Artifacts
47+
if: github.repository != 'otterize/network-mapper' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != 'otterize/network-mapper')
48+
uses: actions/download-artifact@v4
49+
with:
50+
name: ${{ env.REGISTRY }}_${{ github.actor }}_sniffer_${{ github.sha }}.tar
51+
52+
- name: Load Docker image
53+
if: github.repository != 'otterize/network-mapper' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != 'otterize/network-mapper')
54+
run: |-
55+
docker image load -i sniffer.tar
56+
minikube image load ${{ env.REGISTRY }}/${{ github.actor }}/sniffer:${{ github.sha }}
57+
58+
- name: Load images from GitHub Artifacts
59+
if: github.repository != 'otterize/network-mapper' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != 'otterize/network-mapper')
60+
uses: actions/download-artifact@v4
61+
with:
62+
name: ${{ env.REGISTRY }}_${{ github.actor }}_kafka-watcher_${{ github.sha }}.tar
63+
64+
- name: Load Docker image
65+
if: github.repository != 'otterize/network-mapper' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != 'otterize/network-mapper')
66+
run: |-
67+
docker image load -i kafka-watcher.tar
68+
minikube image load ${{ env.REGISTRY }}/${{ github.actor }}/kafka-watcher:${{ github.sha }}
69+
70+
71+
- name: Login to GCR
72+
if: (github.event_name == 'push' && github.repository == 'otterize/network-mapper') || github.event.pull_request.head.repo.full_name == 'otterize/network-mapper'
73+
uses: docker/login-action@v2
74+
with:
75+
registry: ${{ env.REGISTRY }}
76+
username: _json_key_base64
77+
password: ${{ secrets.B64_GCLOUD_SERVICE_ACCOUNT_JSON }}
78+
79+
- name: Load Docker images from GCR
80+
if: (github.event_name == 'push' && github.repository == 'otterize/network-mapper') || github.event.pull_request.head.repo.full_name == 'otterize/network-mapper'
81+
run: |-
82+
docker pull ${{ env.REGISTRY }}/mapper:${{ inputs.mapper-tag }}
83+
minikube image load ${{ env.REGISTRY }}/mapper:${{ inputs.mapper-tag }}
84+
docker pull ${{ env.REGISTRY }}/sniffer:${{ inputs.sniffer-tag }}
85+
minikube image load ${{ env.REGISTRY }}/sniffer:${{ inputs.sniffer-tag }}
86+
87+
- name: Set up Helm
88+
uses: azure/setup-helm@v3
89+
90+
- name: Wait for Calico startup
91+
run: |-
92+
kubectl wait pods -n kube-system -l k8s-app=calico-kube-controllers --for condition=Ready --timeout=90s
93+
kubectl wait pods -n kube-system -l k8s-app=calico-node --for condition=Ready --timeout=90s
94+
kubectl wait pods -n kube-system -l k8s-app=calico-kube-controllers --for condition=Ready --timeout=90s
95+
96+
- name: Deploy Network Mapper
97+
run: |-
98+
MAPPER_FLAGS="--set-string mapper.repository=${{ env.REGISTRY }} --set-string mapper.image=${{ inputs.mapper-image }} --set-string mapper.tag=${{ inputs.mapper-tag }} --set-string mapper.pullPolicy=Never"
99+
SNIFFER_FLAGS="--set-string sniffer.repository=${{ env.REGISTRY }} --set-string sniffer.image=${{ inputs.sniffer-image }} --set-string sniffer.tag=${{ inputs.sniffer-tag }} --set-string sniffer.pullPolicy=Never"
100+
TELEMETRY_FLAG="--set global.telemetry.enabled=false"
101+
helm dep up ./helm-charts/network-mapper
102+
helm install otterize ./helm-charts/network-mapper -n otterize-system --create-namespace --set debug=true $MAPPER_FLAGS $SNIFFER_FLAGS $TELEMETRY_FLAG
103+
104+
- name: Install CLI
105+
run: |-
106+
wget --header="X-Otterize-Test: true" https://get.otterize.com/otterize-cli/v0.1.30/otterize_linux_x86_64.tar.gz
107+
tar xf otterize_linux_x86_64.tar.gz
108+
sudo cp otterize /usr/local/bin
109+
110+
- name: Wait for Otterize
111+
run: |-
112+
kubectl wait pods -n otterize-system -l app=otterize-network-sniffer --for condition=Ready --timeout=90s
113+
kubectl wait pods -n otterize-system -l app=otterize-network-mapper --for condition=Ready --timeout=90s

‎.github/workflows/e2e-test.yaml‎

Lines changed: 7 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -42,96 +42,19 @@ jobs:
4242
with:
4343
submodules: recursive
4444

45-
- name: Start minikube
46-
uses: medyagh/setup-minikube@master
45+
- name: Test setup
46+
uses: ./.github/workflows/e2e-test-setpup-action.yaml
4747
with:
48-
start-args: "--network-plugin=cni --cni=calico"
49-
50-
- name: Load images from GitHub Artifacts
51-
if: github.repository != 'otterize/network-mapper' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != 'otterize/network-mapper')
52-
uses: actions/download-artifact@v4
53-
with:
54-
name: ${{ env.REGISTRY }}_${{ github.actor }}_mapper_${{ github.sha }}.tar
55-
56-
- name: Load Docker image
57-
if: github.repository != 'otterize/network-mapper' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != 'otterize/network-mapper')
58-
run: |-
59-
docker image load -i mapper.tar
60-
minikube image load ${{ env.REGISTRY }}/${{ github.actor }}/mapper:${{ github.sha }}
61-
62-
- name: Load images from GitHub Artifacts
63-
if: github.repository != 'otterize/network-mapper' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != 'otterize/network-mapper')
64-
uses: actions/download-artifact@v4
65-
with:
66-
name: ${{ env.REGISTRY }}_${{ github.actor }}_sniffer_${{ github.sha }}.tar
67-
68-
- name: Load Docker image
69-
if: github.repository != 'otterize/network-mapper' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != 'otterize/network-mapper')
70-
run: |-
71-
docker image load -i sniffer.tar
72-
minikube image load ${{ env.REGISTRY }}/${{ github.actor }}/sniffer:${{ github.sha }}
73-
74-
- name: Load images from GitHub Artifacts
75-
if: github.repository != 'otterize/network-mapper' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != 'otterize/network-mapper')
76-
uses: actions/download-artifact@v4
77-
with:
78-
name: ${{ env.REGISTRY }}_${{ github.actor }}_kafka-watcher_${{ github.sha }}.tar
79-
80-
- name: Load Docker image
81-
if: github.repository != 'otterize/network-mapper' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != 'otterize/network-mapper')
82-
run: |-
83-
docker image load -i kafka-watcher.tar
84-
minikube image load ${{ env.REGISTRY }}/${{ github.actor }}/kafka-watcher:${{ github.sha }}
85-
86-
87-
- name: Login to GCR
88-
if: (github.event_name == 'push' && github.repository == 'otterize/network-mapper') || github.event.pull_request.head.repo.full_name == 'otterize/network-mapper'
89-
uses: docker/login-action@v2
90-
with:
91-
registry: ${{ env.REGISTRY }}
92-
username: _json_key_base64
93-
password: ${{ secrets.B64_GCLOUD_SERVICE_ACCOUNT_JSON }}
94-
95-
- name: Load Docker images from GCR
96-
if: (github.event_name == 'push' && github.repository == 'otterize/network-mapper') || github.event.pull_request.head.repo.full_name == 'otterize/network-mapper'
97-
run: |-
98-
docker pull ${{ env.REGISTRY }}/mapper:${{ inputs.mapper-tag }}
99-
minikube image load ${{ env.REGISTRY }}/mapper:${{ inputs.mapper-tag }}
100-
docker pull ${{ env.REGISTRY }}/sniffer:${{ inputs.sniffer-tag }}
101-
minikube image load ${{ env.REGISTRY }}/sniffer:${{ inputs.sniffer-tag }}
102-
103-
- name: Set up Helm
104-
uses: azure/setup-helm@v3
105-
106-
- name: Wait for Calico startup
107-
run: |-
108-
kubectl wait pods -n kube-system -l k8s-app=calico-kube-controllers --for condition=Ready --timeout=90s
109-
kubectl wait pods -n kube-system -l k8s-app=calico-node --for condition=Ready --timeout=90s
110-
kubectl wait pods -n kube-system -l k8s-app=calico-kube-controllers --for condition=Ready --timeout=90s
111-
112-
- name: Deploy Network Mapper
113-
run: |-
114-
MAPPER_FLAGS="--set-string mapper.repository=${{ env.REGISTRY }} --set-string mapper.image=${{ inputs.mapper-image }} --set-string mapper.tag=${{ inputs.mapper-tag }} --set-string mapper.pullPolicy=Never"
115-
SNIFFER_FLAGS="--set-string sniffer.repository=${{ env.REGISTRY }} --set-string sniffer.image=${{ inputs.sniffer-image }} --set-string sniffer.tag=${{ inputs.sniffer-tag }} --set-string sniffer.pullPolicy=Never"
116-
TELEMETRY_FLAG="--set global.telemetry.enabled=false"
117-
helm dep up ./helm-charts/network-mapper
118-
helm install otterize ./helm-charts/network-mapper -n otterize-system --create-namespace --set debug=true $MAPPER_FLAGS $SNIFFER_FLAGS $TELEMETRY_FLAG
119-
120-
- name: Install CLI
121-
run: |-
122-
wget --header="X-Otterize-Test: true" https://get.otterize.com/otterize-cli/v0.1.30/otterize_linux_x86_64.tar.gz
123-
tar xf otterize_linux_x86_64.tar.gz
124-
sudo cp otterize /usr/local/bin
48+
mapper-tag: ${{ inputs.mapper-tag }}
49+
sniffer-tag: ${{ inputs.sniffer-tag }}
50+
mapper-image: ${{ inputs.mapper-image }}
51+
sniffer-image: ${{ inputs.sniffer-image }}
52+
registry: ${{ inputs.registry }}
12553

12654
- name: Deploy Tutorial services
12755
run: |-
12856
kubectl apply -n otterize-tutorial-mapper -f https://docs.otterize.com/code-examples/network-mapper/all.yaml
12957
130-
- name: Wait for Otterize
131-
run: |-
132-
kubectl wait pods -n otterize-system -l app=otterize-network-sniffer --for condition=Ready --timeout=90s
133-
kubectl wait pods -n otterize-system -l app=otterize-network-mapper --for condition=Ready --timeout=90s
134-
13558
- name: Wait for Tutorial services
13659
run: |-
13760
kubectl wait pods -n otterize-tutorial-mapper -l app=client --for condition=Ready --timeout=90s
@@ -166,7 +89,3 @@ jobs:
16689
diff .github/workflows/tests-expected-results/simple-tutorial-intents.json /tmp/intents.json
16790
echo "expected" && cat .github/workflows/tests-expected-results/simple-tutorial-intents.json
16891
echo "actual" && cat /tmp/intents.json
169-
170-
171-
172-

0 commit comments

Comments
 (0)