Merge branch 'develop' into enhanacement/SKALE-2202-versioning

.github/workflows/dockerimagesim.yml

@@ -17,6 +17,7 @@ jobs:
     - name: submodule update
       run: git submodule update --init --recursive
     - name: build container for release
+      if: contains(github.ref, 'develop') || contains(github.ref, 'beta') || contains(github.ref, 'master') || contains(github.ref, 'stable')
       run: |
         export BRANCH=${GITHUB_REF##*/}
         echo "Branch $BRANCH"
@@ -29,7 +30,7 @@ jobs:
     - name: build container for testing
       run: python3 scripts/docker_build.py DockerfileSimulation sgxwalletsim ${GITHUB_SHA}
     - name: test
-      run: python3 scripts/docker_test.py ${GITHUB_REF##*/} DockerfileSimulation sgxwalletsim
+      run: python3 scripts/docker_test.py DockerfileSimulation sgxwalletsim
     - name: deploy docker image
       if: contains(github.ref, 'develop') || contains(github.ref, 'beta') || contains(github.ref, 'master') || contains(github.ref, 'stable')
       run : |

docker/start.sh

@@ -38,14 +38,7 @@ fi
 
 if [[ "$1" == "-t" ]]; then
 echo "Test run requested"
-./testw [bls-key-encrypt]
-./testw [dkg-encr-sshares]
-./testw [dkg-verify]
-./testw [get-server-status]
-./testw [dkg-api]
-./testw [dkg-poly-exists]
-./testw [aes-encrypt-decrypt]
-./testw [get-server-version]
+./testw.py
 else
    ./sgxwallet $1 $2 $3 $4
 fi

scripts/docker_build.py

@@ -32,7 +32,6 @@ COMMIT_HASH = sys.argv[3]
 TAG_POSTFIX = "latest_commit"
 
 FULL_IMAGE_TAG = "skalenetwork/" + IMAGE_NAME + ":" + TAG_POSTFIX
-COMMIT_HASH_TAG = "skalenetwork/" + IMAGE_NAME + ":" + COMMIT_HASH
 
 print("Starting build", flush=True)
 

scripts/docker_test.py

@@ -29,18 +29,13 @@ topDir = os.getcwd() + "/sgxwallet"
 print("Starting container test")
 print("Top directory is:" + topDir)
 
-BRANCH = sys.argv[1];
-DOCKER_FILE_NAME = sys.argv[2];
-IMAGE_NAME = sys.argv[3]
-
-if (BRANCH == "develop") :
-    TAG_POSTFIX = "latest";
-else :
-    TAG_POSTFIX = "latest_commit"
+DOCKER_FILE_NAME = sys.argv[1];
+IMAGE_NAME = sys.argv[2]
+TAG_POSTFIX = "latest_commit"
 
 FULL_IMAGE_NAME = "skalenetwork/" + IMAGE_NAME +":" + TAG_POSTFIX;
 
-print("Running tests for branch " + BRANCH);
+print("Running tests");
 
 dockerRun = subprocess.run(["docker", "run", "-v", topDir + "/sgx_data:/usr/src/sdk/sgx_data","-t",
                             "-v", "/dev/urandom:/dev/random", "--name", "sgxwallet", "--network=host", "skalenetwork/" + IMAGE_NAME +":" + TAG_POSTFIX, "-t"])

testw.py

@@ -51,7 +51,7 @@ testList = [ "[cert-sign]",
             "[dkg-bls]",
             "[dkg-poly-exists]",
             "[dkg-pub-shares]",
-#            "[many-threads-crypto]",
+            "[many-threads-crypto]",
             "[aes-encrypt-decrypt]",
             "[aes-dkg]"]