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

add some e2e cases about queue #872

Merged
merged 4 commits into from
Jun 21, 2020
Merged

add some e2e cases about queue #872

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e4445b
add some e2e cases about queue
Thor-wl Jun 18, 2020
179b0a2
format case description
Thor-wl Jun 18, 2020
df2b48b
test
Thor-wl Jun 20, 2020
888b98b
remove some redundant cases
Thor-wl Jun 20, 2020
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
193 changes: 125 additions & 68 deletions test/e2e/admission.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"github.com/onsi/gomega"

corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"volcano.sh/volcano/pkg/apis/batch/v1alpha1"
Expand Down Expand Up @@ -65,40 +66,40 @@ var _ = ginkgo.Describe("Job E2E Test: Test Admission service", func() {

var job v1alpha1.Job
jsonData := []byte(`{
"apiVersion": "batch.volcano.sh/v1alpha1",
"kind": "Job",
"metadata": {
"name": "test-job"
},
"spec": {
"minAvailable": 3,
"schedulerName": "volcano",
"queue": "default",
"tasks": [
{
"replicas": 3,
"name": "default-nginx",
"template": {
"spec": {
"containers": [
{
"image": "nginx",
"imagePullPolicy": "IfNotPresent",
"name": "nginx",
"resources": {
"requests": {
"cpu": "-1"
}
}
}
],
"restartPolicy": "Never"
}
}
}
]
}
}`)
"apiVersion": "batch.volcano.sh/v1alpha1",
"kind": "Job",
"metadata": {
"name": "test-job"
},
"spec": {
"minAvailable": 3,
"schedulerName": "volcano",
"queue": "default",
"tasks": [
{
"replicas": 3,
"name": "default-nginx",
"template": {
"spec": {
"containers": [
{
"image": "nginx",
"imagePullPolicy": "IfNotPresent",
"name": "nginx",
"resources": {
"requests": {
"cpu": "-1"
}
}
}
],
"restartPolicy": "Never"
}
}
}
]
}
}`)
err := json.Unmarshal(jsonData, &job)
gomega.Expect(err).NotTo(gomega.HaveOccurred())
_, err = ctx.vcclient.BatchV1alpha1().Jobs(ctx.namespace).Create(context.TODO(), &job, v1.CreateOptions{})
Expand All @@ -112,40 +113,40 @@ var _ = ginkgo.Describe("Job E2E Test: Test Admission service", func() {

var job v1alpha1.Job
jsonData := []byte(`{
"apiVersion": "batch.volcano.sh/v1alpha1",
"kind": "Job",
"metadata": {
"name": "test-job"
},
"spec": {
"minAvailable": 3,
"schedulerName": "volcano",
"queue": "default",
"tasks": [
{
"replicas": 3,
"name": "default-nginx",
"template": {
"spec": {
"containers": [
{
"image": "nginx",
"imagePullPolicy": "IfNotPresent",
"name": "nginx",
"resources": {
"requests": {
"memory": "-1"
}
}
}
],
"restartPolicy": "Never"
}
}
}
]
}
}`)
"apiVersion": "batch.volcano.sh/v1alpha1",
"kind": "Job",
"metadata": {
"name": "test-job"
},
"spec": {
"minAvailable": 3,
"schedulerName": "volcano",
"queue": "default",
"tasks": [
{
"replicas": 3,
"name": "default-nginx",
"template": {
"spec": {
"containers": [
{
"image": "nginx",
"imagePullPolicy": "IfNotPresent",
"name": "nginx",
"resources": {
"requests": {
"memory": "-1"
}
}
}
],
"restartPolicy": "Never"
}
}
}
]
}
}`)

err := json.Unmarshal(jsonData, &job)
gomega.Expect(err).NotTo(gomega.HaveOccurred())
Expand Down Expand Up @@ -1391,4 +1392,60 @@ var _ = ginkgo.Describe("Job E2E Test: Test Admission service", func() {
_, err = ctx.vcclient.BatchV1alpha1().Jobs(ctx.namespace).Create(context.TODO(), &job, v1.CreateOptions{})
gomega.Expect(err).NotTo(gomega.HaveOccurred())
})

ginkgo.It("queue check: create queue by default", func() {
queueName := "default-queue"
ctx := initTestContext(options{})
defer cleanupTestContext(ctx)

queue := &schedulingv1beta1.Queue{
ObjectMeta: metav1.ObjectMeta{
Name: queueName,
},
Spec: schedulingv1beta1.QueueSpec{
Weight: 1,
},
}

_, err := ctx.vcclient.SchedulingV1beta1().Queues().Create(context.TODO(), queue, metav1.CreateOptions{})
gomega.Expect(err).NotTo(gomega.HaveOccurred())
})

ginkgo.It("queue check: open queue can NOT be deleted", func() {
queueName := "deleted-open-queue"
ctx := initTestContext(options{})
defer cleanupTestContext(ctx)

queue := &schedulingv1beta1.Queue{
ObjectMeta: metav1.ObjectMeta{
Name: queueName,
},
Spec: schedulingv1beta1.QueueSpec{
Weight: 1,
},
Status: schedulingv1beta1.QueueStatus{
State: schedulingv1beta1.QueueStateOpen,
},
}

_, err := ctx.vcclient.SchedulingV1beta1().Queues().Create(context.TODO(), queue, metav1.CreateOptions{})
gomega.Expect(err).NotTo(gomega.HaveOccurred())
err = waitQueueStatus(func() (bool, error) {
queue, err := ctx.vcclient.SchedulingV1beta1().Queues().Get(context.TODO(), queue.Name, metav1.GetOptions{})
gomega.Expect(err).NotTo(gomega.HaveOccurred())
return queue.Status.State == schedulingv1beta1.QueueStateOpen, nil
})
gomega.Expect(err).NotTo(gomega.HaveOccurred())
err = ctx.vcclient.SchedulingV1beta1().Queues().Delete(context.TODO(), queue.Name, metav1.DeleteOptions{})
gomega.Expect(err).To(gomega.HaveOccurred())
})

ginkgo.It("queue check: default queue can NOT be deleted", func() {
ctx := initTestContext(options{})
defer cleanupTestContext(ctx)

err := ctx.vcclient.SchedulingV1beta1().Queues().Delete(context.TODO(), "default", metav1.DeleteOptions{})
gomega.Expect(err).To(gomega.HaveOccurred())
})

})