Update image tag

Makefile

@@ -1,6 +1,6 @@
 BIN_DIR=_output/bin
 IMAGE=volcano
-TAG = 1.0
+TAG = 0.1
 
 .EXPORT_ALL_VARIABLES:
 

hack/run-e2e-kind.sh

@@ -62,7 +62,7 @@ function install-volcano {
   helm gen-admission-secret --service integration-admission-service --namespace kube-system
 
   echo "Install volcano chart"
-  helm install installer/chart/volcano --namespace kube-system --name integration --kubeconfig ${KUBECONFIG}
+  helm install installer/chart/volcano --namespace kube-system --name integration --kubeconfig ${KUBECONFIG} --set basic.image_tag_version=${TAG}
 }
 
 function uninstall-volcano {

installer/chart/volcano/config/kube-batch.conf

@@ -3,7 +3,9 @@ tiers:
 - plugins:
   - name: priority
   - name: gang
+  - name: conformance
 - plugins:
   - name: drf
   - name: predicates
   - name: proportion
+  - name: nodeorder

pkg/controllers/job/cache/cache.go

@@ -231,6 +231,9 @@ func (jc *jobCache) Run(stopCh <-chan struct{}) {
 }
 
 func (jc jobCache) TaskCompleted(jobKey, taskName string) bool {
+	jc.Lock()
+	defer jc.Unlock()
+
 	var taskReplicas, completed int32
 
 	jobInfo, found := jc.jobs[jobKey]

pkg/scheduler/actions/preempt/preempt.go

@@ -232,10 +232,9 @@ func preempt(
 			}
 			preempted.Add(preemptee.Resreq)
 			// If reclaimed enough resources, break loop to avoid Sub panic.
-			if resreq.LessEqual(preemptee.Resreq) {
+			if resreq.LessEqual(preempted) {
 				break
 			}
-			resreq.Sub(preemptee.Resreq)
 		}
 
 		metrics.RegisterPreemptionAttempts()

pkg/scheduler/actions/reclaim/reclaim.go

@@ -166,10 +166,9 @@ func (alloc *reclaimAction) Execute(ssn *framework.Session) {
 				}
 				reclaimed.Add(reclaimee.Resreq)
 				// If reclaimed enough resources, break loop to avoid Sub panic.
-				if resreq.LessEqual(reclaimee.Resreq) {
+				if resreq.LessEqual(reclaimed) {
 					break
 				}
-				resreq.Sub(reclaimee.Resreq)
 			}
 
 			glog.V(3).Infof("Reclaimed <%v> for task <%s/%s> requested <%v>.",

test/e2e/util.go

@@ -221,11 +221,11 @@ func cleanupTestContext(cxt *context) {
 	Expect(err).NotTo(HaveOccurred())
 
 	// Wait for namespace deleted.
-	err = wait.Poll(100*time.Millisecond, oneMinute, namespaceNotExist(cxt))
+	err = wait.Poll(100*time.Millisecond, twoMinute, namespaceNotExist(cxt))
 	Expect(err).NotTo(HaveOccurred())
 
 	// Wait for queues deleted
-	err = wait.Poll(100*time.Millisecond, oneMinute, queueNotExist(cxt))
+	err = wait.Poll(100*time.Millisecond, twoMinute, queueNotExist(cxt))
 	Expect(err).NotTo(HaveOccurred())
 }