regress: Fix some bugs in tests

diff --git a/regress/scripts/kubernetes/kubernetes-plugin-test-0001.yaml b/regress/scripts/kubernetes/kubernetes-plugin-test-0001.yaml
index 4f72836da97ad3d5bf10f9f5ac336006f0ec09c9..7024ec4695141e08b7a82a2f814e1402570e9c60 100644 (file)
--- a/regress/scripts/kubernetes/kubernetes-plugin-test-0001.yaml
+++ b/regress/scripts/kubernetes/kubernetes-plugin-test-0001.yaml
@@ -38,6 +38,7 @@ spec:
   containers:
     - name: test-nginx-container
       image: nginx
+      imagePullPolicy: IfNotPresent
       ports:
         - containerPort: 80
           name: "http-server"
@@ -71,6 +72,7 @@ spec:
   containers:
     - name: test-nginx-container
       image: nginx
+      imagePullPolicy: IfNotPresent
       ports:
         - containerPort: 80
           name: "http-server"
@@ -109,6 +111,7 @@ spec:
   containers:
     - name: test-nginx-container
       image: nginx
+      imagePullPolicy: IfNotPresent
       ports:
         - containerPort: 80
           name: "http-server"

diff --git a/regress/scripts/kubernetes/kubernetes-plugin-test-0002.yaml b/regress/scripts/kubernetes/kubernetes-plugin-test-0002.yaml
index 02be1bf732af5610d0554708a05a64df1e568b04..febb5600bb39af3ef5f732ad2d0962c2ede9cc75 100644 (file)
--- a/regress/scripts/kubernetes/kubernetes-plugin-test-0002.yaml
+++ b/regress/scripts/kubernetes/kubernetes-plugin-test-0002.yaml
@@ -97,6 +97,7 @@ spec:
   containers:
     - name: test-nginx-container
       image: nginx
+      imagePullPolicy: IfNotPresent
       ports:
         - containerPort: 8080
           name: "http-server"
\ No newline at end of file

diff --git a/regress/scripts/kubernetes/kubernetes-plugin-test-0004.yaml b/regress/scripts/kubernetes/kubernetes-plugin-test-0004.yaml
index c01aa561746fc07025d234c910900079cb48ef9d..3001aaa86a870802262424c092efdb09763b8c80 100644 (file)
--- a/regress/scripts/kubernetes/kubernetes-plugin-test-0004.yaml
+++ b/regress/scripts/kubernetes/kubernetes-plugin-test-0004.yaml
@@ -156,6 +156,7 @@ spec:
   containers:
     - name: test-container-0004-2
       image: nginx
+      imagePullPolicy: IfNotPresent
       ports:
         - containerPort: 80
           name: "http-server"
@@ -176,6 +177,7 @@ spec:
   containers:
     - name: test-container-0004-2
       image: nginx
+      imagePullPolicy: IfNotPresent
       ports:
         - containerPort: 80
           name: "http-server"
@@ -196,6 +198,7 @@ spec:
   containers:
     - name: test-container-0004-3
       image: nginx
+      imagePullPolicy: IfNotPresent
       ports:
         - containerPort: 80
           name: "http-server"
@@ -216,6 +219,7 @@ spec:
   containers:
     - name: test-container-0004-4
       image: nginx
+      imagePullPolicy: IfNotPresent
       ports:
         - containerPort: 80
           name: "http-server"
@@ -236,6 +240,7 @@ spec:
   containers:
     - name: test-container-0004-5
       image: nginx
+      imagePullPolicy: IfNotPresent
       ports:
         - containerPort: 80
           name: "http-server"
@@ -256,6 +261,7 @@ spec:
   containers:
     - name: test-container-0004-6
       image: nginx
+      imagePullPolicy: IfNotPresent
       ports:
         - containerPort: 80
           name: "http-server"
@@ -279,6 +285,7 @@ spec:
   containers:
     - name: test-container-0004-7
       image: nginx
+      imagePullPolicy: IfNotPresent
       ports:
         - containerPort: 80
           name: "http-server"

diff --git a/regress/tests/kubernetes/kubernetes-plugin-tests-0001 b/regress/tests/kubernetes/kubernetes-plugin-tests-0001
index 5ab71da457f4bab5e536afb46a05ec9647d5e529..d19fd5d634a574f508e5532b4e05174366ab8ff5 100755 (executable)
--- a/regress/tests/kubernetes/kubernetes-plugin-tests-0001
+++ b/regress/tests/kubernetes/kubernetes-plugin-tests-0001
@@ -596,7 +596,7 @@ btest6 () {
    TEST=6
    OUTPUT_FILE=${tmp}/blog${TEST}.out
    do_regress_backup_test ${TEST}
-   check_regress_backup_statusT ${TEST}
+   check_regress_backup_statusW ${TEST}
    F=$?
    # Check pvc1 is not backup
    F_1=0
@@ -675,7 +675,7 @@ rtest1 () {
       echo "RET: ${rets[i]}" >> ${tmp}/rlog${TEST}.out
       if [ ${rets[i]} -ne 1 ]; then
          eval ${fs[i]}=1
-         dstat=$((dstat+1))
+         rstat=$((rstat+1))
       fi
    done
 
@@ -734,7 +734,7 @@ rtest2 () {
       echo "RET: ${rets[i]}" >> ${tmp}/rlog${TEST}.out
       if [ ${rets[i]} -ne 1 ]; then
          eval ${fs[i]}=1
-         dstat=$((dstat+1))
+         rstat=$((rstat+1))
       fi
    done
 
@@ -749,7 +749,7 @@ rtest2 () {
 
 estat=0
 
-# etest1
+etest1
 # etest2
 
 bstat=0
@@ -757,17 +757,18 @@ JOBID=1
 # This job is the base of all backup jobs names
 JobName=${JobNameBase}-
 
-# btest1
-# btest2
-# btest3
-# btest4
+btest1
+btest2
+btest3
+btest4
 btest5-pre
 btest5
 btest5-post
 btest6
 
-# rtest1
-# rtest2
+rstat=0
+rtest1
+rtest2
 
-# stop_bacula
+stop_bacula
 end_test
\ No newline at end of file

diff --git a/regress/tests/kubernetes/kubernetes-plugin-tests-0002 b/regress/tests/kubernetes/kubernetes-plugin-tests-0002
index f493d2e8f7c4c51a18b5e9bf6ee0c5a1057fd855..5a7aa306611fb65f5f5678cc33ef0c3e4b349e8d 100755 (executable)
--- a/regress/tests/kubernetes/kubernetes-plugin-tests-0002
+++ b/regress/tests/kubernetes/kubernetes-plugin-tests-0002
@@ -248,7 +248,7 @@ rtest1 () {
    if [ $RET -ne 1 ]
    then
       F=1
-      dstat=$((dstat+1))
+      rstat=$((rstat+1))
    fi
    printf "%s\n" "--------"
    printf "Result restore test ${TEST}:"
@@ -258,7 +258,7 @@ rtest1 () {
 
 estat=0
 
-etest1
+# etest1
 
 bstat=0
 JOBID=1
@@ -266,7 +266,7 @@ JOBID=1
 JobName=${JobNameBase}-
 btest1
 
-dstat=0
+rstat=0
 rtest1
 
 stop_bacula

diff --git a/regress/tests/kubernetes/kubernetes-plugin-tests-0003 b/regress/tests/kubernetes/kubernetes-plugin-tests-0003
index e5ecf5e6976510a7cc46bd1a583141cdc7e474f5..1857c4c149c98b95d6b4d52889be7bbf11289722 100755 (executable)
--- a/regress/tests/kubernetes/kubernetes-plugin-tests-0003
+++ b/regress/tests/kubernetes/kubernetes-plugin-tests-0003
@@ -300,7 +300,7 @@ rtest1 () {
       echo "RET: ${rets[i]}" >> ${tmp}/rlog${TEST}.out
       if [ ${rets[i]} -ne 1 ]; then
          eval ${fs[i]}=1
-         dstat=$((dstat+1))
+         rstat=$((rstat+1))
       fi
    done
 
@@ -322,7 +322,8 @@ JobName=${JobNameBase}-
 
 btest1
 
+rstat=0
 rtest1
 
-# stop_bacula
+stop_bacula
 end_test
\ No newline at end of file

diff --git a/regress/tests/kubernetes/kubernetes-plugin-tests-0004 b/regress/tests/kubernetes/kubernetes-plugin-tests-0004
index 95367a0a954ffd18e08429b5f39c30cbf7f42b3c..05eae28de045d5af60d7c070581eef625271a3e6 100755 (executable)
--- a/regress/tests/kubernetes/kubernetes-plugin-tests-0004
+++ b/regress/tests/kubernetes/kubernetes-plugin-tests-0004
@@ -1514,7 +1514,7 @@ rtest1 () {
       echo "RET: ${rets[i]}" >> ${tmp}/rlog${TEST}.out
       if [ ${rets[i]} -ne 1 ]; then
          eval ${fs[i]}=1
-         dstat=$((dstat+1))
+         rstat=$((rstat+1))
       fi
    done
 
@@ -1582,7 +1582,7 @@ rtest2 () {
       echo "RET: ${rets[i]}" >> ${tmp}/rlog${TEST}.out
       if [ ${rets[i]} -ne 1 ]; then
          eval ${fs[i]}=1
-         dstat=$((dstat+1))
+         rstat=$((rstat+1))
       fi
    done
 
@@ -1649,7 +1649,7 @@ rtest3 () {
       echo "RET: ${rets[i]}" >> ${tmp}/rlog${TEST}.out
       if [ ${rets[i]} -ne 1 ]; then
          eval ${fs[i]}=1
-         dstat=$((dstat+1))
+         rstat=$((rstat+1))
       fi
    done
 
@@ -1715,7 +1715,7 @@ rtest4 () {
       echo "RET: ${rets[i]}" >> ${tmp}/rlog${TEST}.out
       if [ ${rets[i]} -ne 1 ]; then
          eval ${fs[i]}=1
-         dstat=$((dstat+1))
+         rstat=$((rstat+1))
       fi
    done
 
@@ -1790,7 +1790,7 @@ rtest5 () {
       echo "RET: ${rets[i]}" >> ${tmp}/rlog${TEST}.out
       if [ ${rets[i]} -ne 1 ]; then
          eval ${fs[i]}=1
-         dstat=$((dstat+1))
+         rstat=$((dstat+1))
       fi
    done
 
@@ -1826,12 +1826,12 @@ btest11
 btest12
 btest13
 
-dstat=0
+rstat=0
 rtest1
 rtest2
 rtest3
 rtest4
 rtest5
 
-# stop_bacula
+stop_bacula
 end_test
\ No newline at end of file