a

deckhouse · Oct 2, 2024 · 18e5f07 · 18e5f07
1 parent 87c873d
commit 18e5f07
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 1,756 deletions.
diff --git a/.github/ci_templates/e2e_tests.yml b/.github/ci_templates/e2e_tests.yml
@@ -632,7 +632,6 @@ check_e2e_labels:
 {!{-   $runsOnLabel = "e2e-vsphere" -}!}
 {!{- end -}!}
 # <template: e2e_run_job_template>
-{!{ tmpl.Exec "check_e2e_labels_job" . }!}
 {!{ $ctx.jobID }!}:
   name: "{!{ $ctx.jobName }!}"
   if: ${{ github.event.inputs.cri == '{!{ $ctx.cri }!}' && github.event.inputs.k8s_version == '{!{ $ctx.kubernetesVersion }!}' && github.event.inputs.layout == '{!{ $ctx.layout }!}' }}

diff --git a/.github/workflow_templates/e2e.abort.multi.yml b/.github/workflow_templates/e2e.abort.multi.yml
@@ -102,6 +102,8 @@ jobs:
     steps:
 {!{ tmpl.Exec "started_at_output" . | strings.Indent 6 }!}
 
+{!{ tmpl.Exec "check_e2e_labels_job" $ctx | strings.Indent 2 }!}
+
 {!{/* Jobs for each CRI and Kubernetes version */}!}
 {!{/* Note: it is sufficient to have one workflow 'e2e-abort.yaml' with one 'destroy' job and use provider, cri, k8s_version and layout from inputs. Still there are jobs for each CRI and Kubernetes version for similarity with e2e.multi.yaml */}!}
 {!{- $lastCommentNeeds := slice "started_at" -}!}

diff --git a/.github/workflows/e2e-abort-aws.yml b/.github/workflows/e2e-abort-aws.yml
@@ -70,9 +70,6 @@ jobs:
           echo "started_at=${unixTimestamp}" >> $GITHUB_OUTPUT
       # </template: started_at_output>
 
-
-
-  # <template: e2e_run_job_template>
   # <template: check_e2e_labels_job>
   check_e2e_labels:
     name: Check e2e labels
@@ -105,6 +102,10 @@ jobs:
             const ci = require('./.github/scripts/js/ci');
             return await ci.checkE2ELabels({github, context, core, provider, kubernetesDefaultVersion});
   # </template: check_e2e_labels_job>
+
+
+
+  # <template: e2e_run_job_template>
   run_containerd_1_26:
     name: "destroy cluster: AWS, Containerd, Kubernetes 1.26"
     if: ${{ github.event.inputs.cri == 'containerd' && github.event.inputs.k8s_version == '1.26' && github.event.inputs.layout == 'WithoutNAT' }}
@@ -395,38 +396,6 @@ jobs:
   # </template: e2e_run_job_template>
 
   # <template: e2e_run_job_template>
-  # <template: check_e2e_labels_job>
-  check_e2e_labels:
-    name: Check e2e labels
-    runs-on: ubuntu-latest
-    outputs:
-
-      run_containerd_1_26: ${{ steps.check.outputs.run_containerd_1_26 }}
-      run_containerd_1_27: ${{ steps.check.outputs.run_containerd_1_27 }}
-      run_containerd_1_28: ${{ steps.check.outputs.run_containerd_1_28 }}
-      run_containerd_1_29: ${{ steps.check.outputs.run_containerd_1_29 }}
-      run_containerd_1_30: ${{ steps.check.outputs.run_containerd_1_30 }}
-      run_containerd_1_31: ${{ steps.check.outputs.run_containerd_1_31 }}
-      run_containerd_automatic: ${{ steps.check.outputs.run_containerd_automatic }}
-      multimaster: ${{ steps.check.outputs.multimaster }}
-    steps:
-
-      # <template: checkout_step>
-      - name: Checkout sources
-        uses: actions/checkout@v3.5.2
-
-      # </template: checkout_step>
-      - name: Check e2e labels
-        id: check
-        uses: actions/github-script@v6.4.1
-        with:
-          script: |
-            const provider = 'aws';
-            const kubernetesDefaultVersion = '1.27';
-
-            const ci = require('./.github/scripts/js/ci');
-            return await ci.checkE2ELabels({github, context, core, provider, kubernetesDefaultVersion});
-  # </template: check_e2e_labels_job>
   run_containerd_1_27:
     name: "destroy cluster: AWS, Containerd, Kubernetes 1.27"
     if: ${{ github.event.inputs.cri == 'containerd' && github.event.inputs.k8s_version == '1.27' && github.event.inputs.layout == 'WithoutNAT' }}
@@ -717,38 +686,6 @@ jobs:
   # </template: e2e_run_job_template>
 
   # <template: e2e_run_job_template>
-  # <template: check_e2e_labels_job>
-  check_e2e_labels:
-    name: Check e2e labels
-    runs-on: ubuntu-latest
-    outputs:
-
-      run_containerd_1_26: ${{ steps.check.outputs.run_containerd_1_26 }}
-      run_containerd_1_27: ${{ steps.check.outputs.run_containerd_1_27 }}
-      run_containerd_1_28: ${{ steps.check.outputs.run_containerd_1_28 }}
-      run_containerd_1_29: ${{ steps.check.outputs.run_containerd_1_29 }}
-      run_containerd_1_30: ${{ steps.check.outputs.run_containerd_1_30 }}
-      run_containerd_1_31: ${{ steps.check.outputs.run_containerd_1_31 }}
-      run_containerd_automatic: ${{ steps.check.outputs.run_containerd_automatic }}
-      multimaster: ${{ steps.check.outputs.multimaster }}
-    steps:
-
-      # <template: checkout_step>
-      - name: Checkout sources
-        uses: actions/checkout@v3.5.2
-
-      # </template: checkout_step>
-      - name: Check e2e labels
-        id: check
-        uses: actions/github-script@v6.4.1
-        with:
-          script: |
-            const provider = 'aws';
-            const kubernetesDefaultVersion = '1.27';
-
-            const ci = require('./.github/scripts/js/ci');
-            return await ci.checkE2ELabels({github, context, core, provider, kubernetesDefaultVersion});
-  # </template: check_e2e_labels_job>
   run_containerd_1_28:
     name: "destroy cluster: AWS, Containerd, Kubernetes 1.28"
     if: ${{ github.event.inputs.cri == 'containerd' && github.event.inputs.k8s_version == '1.28' && github.event.inputs.layout == 'WithoutNAT' }}
@@ -1039,38 +976,6 @@ jobs:
   # </template: e2e_run_job_template>
 
   # <template: e2e_run_job_template>
-  # <template: check_e2e_labels_job>
-  check_e2e_labels:
-    name: Check e2e labels
-    runs-on: ubuntu-latest
-    outputs:
-
-      run_containerd_1_26: ${{ steps.check.outputs.run_containerd_1_26 }}
-      run_containerd_1_27: ${{ steps.check.outputs.run_containerd_1_27 }}
-      run_containerd_1_28: ${{ steps.check.outputs.run_containerd_1_28 }}
-      run_containerd_1_29: ${{ steps.check.outputs.run_containerd_1_29 }}
-      run_containerd_1_30: ${{ steps.check.outputs.run_containerd_1_30 }}
-      run_containerd_1_31: ${{ steps.check.outputs.run_containerd_1_31 }}
-      run_containerd_automatic: ${{ steps.check.outputs.run_containerd_automatic }}
-      multimaster: ${{ steps.check.outputs.multimaster }}
-    steps:
-
-      # <template: checkout_step>
-      - name: Checkout sources
-        uses: actions/checkout@v3.5.2
-
-      # </template: checkout_step>
-      - name: Check e2e labels
-        id: check
-        uses: actions/github-script@v6.4.1
-        with:
-          script: |
-            const provider = 'aws';
-            const kubernetesDefaultVersion = '1.27';
-
-            const ci = require('./.github/scripts/js/ci');
-            return await ci.checkE2ELabels({github, context, core, provider, kubernetesDefaultVersion});
-  # </template: check_e2e_labels_job>
   run_containerd_1_29:
     name: "destroy cluster: AWS, Containerd, Kubernetes 1.29"
     if: ${{ github.event.inputs.cri == 'containerd' && github.event.inputs.k8s_version == '1.29' && github.event.inputs.layout == 'WithoutNAT' }}
@@ -1361,38 +1266,6 @@ jobs:
   # </template: e2e_run_job_template>
 
   # <template: e2e_run_job_template>
-  # <template: check_e2e_labels_job>
-  check_e2e_labels:
-    name: Check e2e labels
-    runs-on: ubuntu-latest
-    outputs:
-
-      run_containerd_1_26: ${{ steps.check.outputs.run_containerd_1_26 }}
-      run_containerd_1_27: ${{ steps.check.outputs.run_containerd_1_27 }}
-      run_containerd_1_28: ${{ steps.check.outputs.run_containerd_1_28 }}
-      run_containerd_1_29: ${{ steps.check.outputs.run_containerd_1_29 }}
-      run_containerd_1_30: ${{ steps.check.outputs.run_containerd_1_30 }}
-      run_containerd_1_31: ${{ steps.check.outputs.run_containerd_1_31 }}
-      run_containerd_automatic: ${{ steps.check.outputs.run_containerd_automatic }}
-      multimaster: ${{ steps.check.outputs.multimaster }}
-    steps:
-
-      # <template: checkout_step>
-      - name: Checkout sources
-        uses: actions/checkout@v3.5.2
-
-      # </template: checkout_step>
-      - name: Check e2e labels
-        id: check
-        uses: actions/github-script@v6.4.1
-        with:
-          script: |
-            const provider = 'aws';
-            const kubernetesDefaultVersion = '1.27';
-
-            const ci = require('./.github/scripts/js/ci');
-            return await ci.checkE2ELabels({github, context, core, provider, kubernetesDefaultVersion});
-  # </template: check_e2e_labels_job>
   run_containerd_1_30:
     name: "destroy cluster: AWS, Containerd, Kubernetes 1.30"
     if: ${{ github.event.inputs.cri == 'containerd' && github.event.inputs.k8s_version == '1.30' && github.event.inputs.layout == 'WithoutNAT' }}
@@ -1683,38 +1556,6 @@ jobs:
   # </template: e2e_run_job_template>
 
   # <template: e2e_run_job_template>
-  # <template: check_e2e_labels_job>
-  check_e2e_labels:
-    name: Check e2e labels
-    runs-on: ubuntu-latest
-    outputs:
-
-      run_containerd_1_26: ${{ steps.check.outputs.run_containerd_1_26 }}
-      run_containerd_1_27: ${{ steps.check.outputs.run_containerd_1_27 }}
-      run_containerd_1_28: ${{ steps.check.outputs.run_containerd_1_28 }}
-      run_containerd_1_29: ${{ steps.check.outputs.run_containerd_1_29 }}
-      run_containerd_1_30: ${{ steps.check.outputs.run_containerd_1_30 }}
-      run_containerd_1_31: ${{ steps.check.outputs.run_containerd_1_31 }}
-      run_containerd_automatic: ${{ steps.check.outputs.run_containerd_automatic }}
-      multimaster: ${{ steps.check.outputs.multimaster }}
-    steps:
-
-      # <template: checkout_step>
-      - name: Checkout sources
-        uses: actions/checkout@v3.5.2
-
-      # </template: checkout_step>
-      - name: Check e2e labels
-        id: check
-        uses: actions/github-script@v6.4.1
-        with:
-          script: |
-            const provider = 'aws';
-            const kubernetesDefaultVersion = '1.27';
-
-            const ci = require('./.github/scripts/js/ci');
-            return await ci.checkE2ELabels({github, context, core, provider, kubernetesDefaultVersion});
-  # </template: check_e2e_labels_job>
   run_containerd_1_31:
     name: "destroy cluster: AWS, Containerd, Kubernetes 1.31"
     if: ${{ github.event.inputs.cri == 'containerd' && github.event.inputs.k8s_version == '1.31' && github.event.inputs.layout == 'WithoutNAT' }}
@@ -2005,38 +1846,6 @@ jobs:
   # </template: e2e_run_job_template>
 
   # <template: e2e_run_job_template>
-  # <template: check_e2e_labels_job>
-  check_e2e_labels:
-    name: Check e2e labels
-    runs-on: ubuntu-latest
-    outputs:
-
-      run_containerd_1_26: ${{ steps.check.outputs.run_containerd_1_26 }}
-      run_containerd_1_27: ${{ steps.check.outputs.run_containerd_1_27 }}
-      run_containerd_1_28: ${{ steps.check.outputs.run_containerd_1_28 }}
-      run_containerd_1_29: ${{ steps.check.outputs.run_containerd_1_29 }}
-      run_containerd_1_30: ${{ steps.check.outputs.run_containerd_1_30 }}
-      run_containerd_1_31: ${{ steps.check.outputs.run_containerd_1_31 }}
-      run_containerd_automatic: ${{ steps.check.outputs.run_containerd_automatic }}
-      multimaster: ${{ steps.check.outputs.multimaster }}
-    steps:
-
-      # <template: checkout_step>
-      - name: Checkout sources
-        uses: actions/checkout@v3.5.2
-
-      # </template: checkout_step>
-      - name: Check e2e labels
-        id: check
-        uses: actions/github-script@v6.4.1
-        with:
-          script: |
-            const provider = 'aws';
-            const kubernetesDefaultVersion = '1.27';
-
-            const ci = require('./.github/scripts/js/ci');
-            return await ci.checkE2ELabels({github, context, core, provider, kubernetesDefaultVersion});
-  # </template: check_e2e_labels_job>
   run_containerd_automatic:
     name: "destroy cluster: AWS, Containerd, Kubernetes Automatic"
     if: ${{ github.event.inputs.cri == 'containerd' && github.event.inputs.k8s_version == 'Automatic' && github.event.inputs.layout == 'WithoutNAT' }}