Skip to content

Commit

Permalink
remove cri labels
Browse files Browse the repository at this point in the history
Signed-off-by: Nikolay Gorbatov <nikolay.gorbatov@flant.com>
  • Loading branch information
sprait committed Apr 1, 2024
1 parent 29b3d02 commit 6bc0c0a
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 11 deletions.
7 changes: 1 addition & 6 deletions .github/scripts/js/ci.js
Original file line number Diff line number Diff line change
Expand Up @@ -639,8 +639,6 @@ const parseCommandArgumentAsRef = (cmdArg) => {
* /build release-1.30
* /e2e/run/aws v1.31.0-alpha.0
* /e2e/use/k8s/1.22
* /e2e/use/cri/docker
* /e2e/use/cri/containerd
* /deploy/web/stage v1.3.2
* /deploy/alpha - to deploy all editions
* /deploy/alpha/ce,ee,fe
Expand Down Expand Up @@ -1200,18 +1198,15 @@ Put \`/e2e/use\` options below \`/e2e/run\` command to set specific CRI and Kube
\`\`\`
/e2e/run/aws main
/e2e/use/cri/docker
/e2e/use/cri/containerd
/e2e/use/k8s/1.20
/e2e/use/k8s/1.23
This comment will run 4 e2e jobs on AWS with Docker and containerd
This comment will run 2 e2e jobs on AWS with containerd
and with Kubernetes version 1.20 and 1.23 using image built from main branch.
\`\`\`
\`\`\`
/e2e/run/aws release-1.35 release-1.36
/e2e/use/cri/containerd
/e2e/use/k8s/1.23
This comment will create cluster in AWS using Deckhouse built from release-1.35 branch
Expand Down
4 changes: 0 additions & 4 deletions .github/scripts/js/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ const labels = {
'e2e/run/yandex-cloud': { type: 'e2e-run', provider: 'yandex-cloud' },
'e2e/run/static': { type: 'e2e-run', provider: 'static' },

// E2E: use CRI
'e2e/use/cri/docker': { type: 'e2e-use', cri: 'Docker' },
'e2e/use/cri/containerd': { type: 'e2e-use', cri: 'Containerd' },

// E2E: use Kubernetes version
'e2e/use/k8s/1.25': { type: 'e2e-use', ver: '1.25' },
'e2e/use/k8s/1.26': { type: 'e2e-use', ver: '1.26' },
Expand Down
1 change: 0 additions & 1 deletion .github/scripts/js/specs/constants.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ test('knownProviders', () => {

test('knownCRINames', () => {
expect(knownCRINames).toContain('Containerd')
expect(knownCRINames).toContain('Docker')
})

test('knownKubernetesVersions', () => {
Expand Down

0 comments on commit 6bc0c0a

Please sign in to comment.