Merge branch 'test' of http://gitlab.fjmaimaimai.com/mmm-go/opp into test

 #!/bin/bash
 #!/bin/bash
 export PATH=/root/local/bin:$PATH
 export PATH=/root/local/bin:$PATH
-kubectl -n mmm-suplus-test get pods | grep -q opp
+kubectl -n mmm-suplus-test get pods | grep -q mmmopp
 if [ "$?" == "1" ];then
 if [ "$?" == "1" ];then
 	kubectl create -f /tmp/test/mmm-go-opp/opp.yaml --record
 	kubectl create -f /tmp/test/mmm-go-opp/opp.yaml --record
-	kubectl -n mmm-suplus-test get svc | grep -q opp
+	kubectl -n mmm-suplus-test get svc | grep -q mmmopp
 	if [ "$?" == "0" ];then
 	if [ "$?" == "0" ];then
-		echo "opp service install success!"
+		echo "mmmopp service install success!"
 	else
 	else
-		echo "opp service install fail!"
+		echo "mmmopp service install fail!"
 	fi
 	fi
-	kubectl -n mmm-suplus-test get pods | grep -q opp
+	kubectl -n mmm-suplus-test get pods | grep -q mmmopp
 	if [ "$?" == "0" ];then
 	if [ "$?" == "0" ];then
-		echo "opp deployment install success!"
+		echo "mmmopp deployment install success!"
 	else
 	else
-		echo "opp deployment install fail!"
+		echo "mmmopp deployment install fail!"
 	fi
 	fi
 else
 else
 	kubectl delete -f /tmp/test/mmm-go-opp/opp.yaml
 	kubectl delete -f /tmp/test/mmm-go-opp/opp.yaml
-	kubectl -n mmm-suplus-test get svc | grep -q opp
+	kubectl -n mmm-suplus-test get svc | grep -q mmmopp
 	while [ "$?" == "0" ]
 	while [ "$?" == "0" ]
 	do
 	do
-	kubectl -n mmm-suplus-test get svc | grep -q opp
+	kubectl -n mmm-suplus-test get svc | grep -q mmmopp
 	done
 	done
-	kubectl -n mmm-suplus-test get pods | grep -q opp
+	kubectl -n mmm-suplus-test get pods | grep -q mmmopp
 	while [ "$?" == "0" ]
 	while [ "$?" == "0" ]
 	do
 	do
-	kubectl -n mmm-suplus-test get pods | grep -q opp
+	kubectl -n mmm-suplus-test get pods | grep -q mmmopp
 	done
 	done
 	kubectl create -f /tmp/test/mmm-go-opp/opp.yaml --record
 	kubectl create -f /tmp/test/mmm-go-opp/opp.yaml --record
-	kubectl -n mmm-suplus-test get svc | grep -q opp
+	kubectl -n mmm-suplus-test get svc | grep -q mmmopp
 	if [ "$?" == "0" ];then
 	if [ "$?" == "0" ];then
-		echo "opp service update success!"
+		echo "mmmopp service update success!"
 	else
 	else
 		echo "opp service update fail!"
 		echo "opp service update fail!"
 	fi
 	fi

@@ -44,13 +44,13 @@ spec:
                       - cn-hangzhou.i-bp1hyp5oips9cdwxxgxy
                       - cn-hangzhou.i-bp1hyp5oips9cdwxxgxy
       containers:
       containers:
         - name: mmmopp
         - name: mmmopp
-          image: 192.168.0.243:5000/mmm/mmmopp:test
+          image: 192.168.0.243:5000/mmm/mmmopp:dev
           imagePullPolicy: Always
           imagePullPolicy: Always
           volumeMounts:
           volumeMounts:
             - mountPath:  /opt/logs
             - mountPath:  /opt/logs
               name: accesslogs
               name: accesslogs
             - mountPath: /var/www/opp-test/file
             - mountPath: /var/www/opp-test/file
-              name: mmmjihuitest-pvc1
+              name: mmmjihuitest2-pvc1
           ports:
           ports:
             - containerPort: 8080
             - containerPort: 8080
           env:
           env:
@@ -97,6 +97,6 @@ spec:
       volumes:
       volumes:
         - name: accesslogs
         - name: accesslogs
           emptyDir: {}
           emptyDir: {}
-        - name: mmmjihuitest-pvc1
+        - name: mmmjihuitest2-pvc1
           persistentVolumeClaim:
           persistentVolumeClaim:
-            claimName: mmmjihuitest-pvc
+            claimName: mmmjihuitest2-pvc