fix docker build in stable & add Aura test (reverted from commit d7eb3cb51e)

.gitlab-ci.yml

@@ -526,15 +526,12 @@ windows:
 docker-build:
   stage: build
   only:
-    - beta
-    - stable
     - tags
     - triggers
   before_script:
     - docker info
   script:
     - if [ "$CI_BUILD_REF_NAME" == "beta-release" ]; then DOCKER_TAG="latest"; else DOCKER_TAG=$CI_BUILD_REF_NAME; fi
-    - echo "Tag:" $DOCKER_TAG
     - docker login -u $Docker_Hub_User_Parity -p $Docker_Hub_Pass_Parity
     - sh scripts/docker-build.sh $DOCKER_TAG
     - docker logout
@@ -574,7 +571,6 @@ test-rust-stable:
   script:
     - export RUST_BACKTRACE=1
     - if [ $RUST_FILES_MODIFIED -eq 0 ]; then echo "Skipping Rust tests since no Rust files modified."; else ./test.sh $CARGOFLAGS; fi
-    - if [ $CI_BUILD_REF_NAME =~ ^(beta|stable|nightly)$ ]; then sh scripts/aura-test.sh; fi
   tags:
     - rust
     - rust-stable

scripts/aura-test.sh

@@ -1,25 +0,0 @@
-#!/bin/bash
-rm -rf parity-import-tests/
-cargo build -j $(nproc) --release --features final 
-git clone https://github.com/paritytech/parity-import-tests
-cp target/release/parity parity-import-tests/aura/parity
-cd parity-import-tests/aura
-./parity -v
-echo "Start Aura test"
-./parity import blocks.rlp --chain chain.json
-if [ $? -eq 0 ]
-then
-  echo "Import test passed"
-else
-  echo "Import test failed" >&2
-  exit 1
-fi
-./parity restore snap --chain chain.json --log-file restore.log
-if [ $? -eq 0 ]
-then
-  echo "Restore test passed"
-else
-  echo "Restore test failed" >&2
-  exit 1
-fi
-echo "Aura test complete"

scripts/docker-build.sh

@@ -1,8 +1,6 @@
 #!/bin/bash
 cd docker/hub
-DOCKER_BUILD_TAG=$1
+if [ "$1" == "latest" ]; then DOCKER_BUILD_TAG="beta-release"; fi
-echo "Docker build tag: " $DOCKER_BUILD_TAG
+docker build --build-arg BUILD_TAG=$DOCKER_BUILD_TAG --no-cache=true --tag ethcore/parity:$1 .
-docker build --build-arg BUILD_TAG=$DOCKER_BUILD_TAG --no-cache=true --tag parity/parity:$DOCKER_BUILD_TAG .
+docker push ethcore/parity:$1
-docker run -it parity/parity:$DOCKER_BUILD_TAG -v
-docker push parity/parity:$DOCKER_BUILD_TAG