Skip to content

Commit b96aa4b

Browse files
rm debug config
Signed-off-by: Nikita Korolev <nikita.korolev@flant.com>
1 parent e50f430 commit b96aa4b

2 files changed

Lines changed: 15 additions & 17 deletions

File tree

.github/workflows/e2e-matrix.yml

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,8 @@ name: E2E Matrix Tests (nested clusters)
1616

1717
on:
1818
workflow_dispatch:
19-
pull_request:
20-
types: [opened, reopened, synchronize, labeled, unlabeled]
21-
branches:
22-
- main
23-
- feat/ci/e2e-nested-add-sdn
24-
# schedule:
25-
# - cron: "40 4 * * *"
19+
schedule:
20+
- cron: "40 4 * * *"
2621

2722
concurrency:
2823
group: "${{ github.workflow }}-${{ github.event.number || github.ref }}"
@@ -34,7 +29,6 @@ defaults:
3429

3530
jobs:
3631
cleanup-nested-clusters:
37-
if: github.event_name != 'pull_request'
3832
name: Cleanup nested clusters
3933
runs-on: ubuntu-latest
4034
steps:
@@ -106,7 +100,6 @@ jobs:
106100
cleanup_kind "vmclass"
107101
108102
power-off-vms-for-nested:
109-
if: github.event_name != 'pull_request'
110103
name: Power off VMs for nested clusters
111104
needs: cleanup-nested-clusters
112105
runs-on: ubuntu-latest
@@ -322,7 +315,7 @@ jobs:
322315
fi
323316
set-vars:
324317
name: Set vars
325-
# needs: power-off-vms-for-nested
318+
needs: power-off-vms-for-nested
326319
runs-on: ubuntu-latest
327320
outputs:
328321
date_start: ${{ steps.vars.outputs.date-start }}
@@ -342,6 +335,7 @@ jobs:
342335
with:
343336
storage_type: replicated
344337
nested_storageclass_name: nested-thin-r1
338+
nested_cluster_network_name: cn-4006-for-e2e-test
345339
branch: main
346340
virtualization_tag: main
347341
deckhouse_channel: alpha
@@ -352,22 +346,21 @@ jobs:
352346
randuuid4c: ${{ needs.set-vars.outputs.randuuid4c }}
353347
cluster_config_workers_memory: "9Gi"
354348
cluster_config_k8s_version: "1.34"
355-
e2e_focus_tests: "VirtualMachineAdditionalNetworkInterfaces"
356349
secrets:
357350
DEV_REGISTRY_DOCKER_CFG: ${{ secrets.DEV_REGISTRY_DOCKER_CFG }}
358351
VIRT_E2E_NIGHTLY_SA_TOKEN: ${{ secrets.VIRT_E2E_NIGHTLY_SA_TOKEN }}
359352
PROD_IO_REGISTRY_DOCKER_CFG: ${{ secrets.PROD_IO_REGISTRY_DOCKER_CFG }}
360353
BOOTSTRAP_DEV_PROXY: ${{ secrets.BOOTSTRAP_DEV_PROXY }}
361354

362355
e2e-nfs:
363-
if: github.event_name != 'pull_request'
364356
name: E2E Pipeline (NFS)
365357
needs:
366358
- set-vars
367359
uses: ./.github/workflows/e2e-reusable-pipeline.yml
368360
with:
369361
storage_type: nfs
370362
nested_storageclass_name: nfs
363+
nested_cluster_network_name: cn-4006-for-e2e-test
371364
branch: main
372365
virtualization_tag: main
373366
deckhouse_channel: alpha
@@ -389,7 +382,7 @@ jobs:
389382
name: End-to-End tests report
390383
needs:
391384
- e2e-replicated
392-
# - e2e-nfs
385+
- e2e-nfs
393386
if: ${{ always()}}
394387
env:
395388
STORAGE_TYPES: '["replicated", "nfs"]'
@@ -656,5 +649,4 @@ jobs:
656649
curl --request POST --header 'Content-Type: application/json' --data "{\"text\": \"${COMBINED_SUMMARY}\"}" "$LOOP_WEBHOOK_URL"
657650
fi
658651
env:
659-
LOOP_WEBHOOK_URL: ${{ secrets.LOOP_TEST_CHANNEL }}
660-
# LOOP_WEBHOOK_URL: ${{ secrets.LOOP_WEBHOOK_URL }}
652+
LOOP_WEBHOOK_URL: ${{ secrets.LOOP_WEBHOOK_URL }}

.github/workflows/e2e-reusable-pipeline.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,11 @@ on:
9393
type: string
9494
default: ""
9595
description: "E2E tests focus tests like 'VirtualMachineConfiguration' and so on (by default all tests are run)"
96+
nested_cluster_network_name:
97+
required: false
98+
type: string
99+
default: "cn-4006-for-e2e-test"
100+
description: "ClusterNetwork name for nested VM additional network interface"
96101
secrets:
97102
DEV_REGISTRY_DOCKER_CFG:
98103
required: true
@@ -141,7 +146,7 @@ jobs:
141146
run: |
142147
GIT_SHORT_HASH=$(git rev-parse --short HEAD)
143148
144-
namespace="test-sdn-e2e-$STORAGE_TYPE-$GIT_SHORT_HASH-$RANDUUID4C"
149+
namespace="nightly-e2e-$STORAGE_TYPE-$GIT_SHORT_HASH-$RANDUUID4C"
145150
146151
echo "namespace=$namespace" >> $GITHUB_OUTPUT
147152
echo "sha_short=$GIT_SHORT_HASH" >> $GITHUB_OUTPUT
@@ -235,6 +240,8 @@ jobs:
235240
size: ${{ inputs.cluster_config_workers_memory }}
236241
additionalDisks:
237242
- size: 50Gi
243+
networkConfig:
244+
clusterNetworkName: ${{ inputs.nested_cluster_network_name }}
238245
EOF
239246
240247
mkdir -p tmp
@@ -1308,7 +1315,6 @@ jobs:
13081315
13091316
echo "[INFO] Exit code: $GINKGO_EXIT_CODE"
13101317
exit $GINKGO_EXIT_CODE
1311-
# exit 1
13121318
- name: Upload summary test results (junit/xml)
13131319
uses: actions/upload-artifact@v4
13141320
id: e2e-report-artifact

0 commit comments

Comments
 (0)