Backport master ci prs

.gitlab-ci.yml

@@ -18,9 +18,9 @@ linux-stable:
   stage: build
   image: parity/rust:gitlab-ci
   only:
-    - stable
     - beta
     - tags
+    - stable
     - triggers
   script:
     - rustup default stable
@@ -36,9 +36,9 @@ linux-stable-debian:
   stage: build
   image: parity/rust-debian:gitlab-ci
   only:
-    - stable
     - beta
     - tags
+    - stable
     - triggers
   script:
     - export LIBSSL="libssl1.1 (>=1.1.0)"
@@ -53,9 +53,9 @@ linux-centos:
   stage: build
   image: parity/rust-centos:gitlab-ci
   only:
-    - stable
     - beta
     - tags
+    - stable
     - triggers
   script:
     - scripts/gitlab-build.sh x86_64-unknown-centos-gnu x86_64-unknown-linux-gnu x86_64 gcc g++ centos
@@ -69,9 +69,9 @@ linux-i686:
   stage: build
   image: parity/rust-i686:gitlab-ci
   only:
-    - stable
     - beta
     - tags
+    - stable
     - triggers
   script:
     - scripts/gitlab-build.sh i686-unknown-linux-gnu i686-unknown-linux-gnu i386 gcc g++ ubuntu
@@ -85,9 +85,9 @@ linux-armv7:
   stage: build
   image: parity/rust-armv7:gitlab-ci
   only:
-    - stable
     - beta
     - tags
+    - stable
     - triggers
   script:
     - scripts/gitlab-build.sh armv7-unknown-linux-gnueabihf armv7-unknown-linux-gnueabihf armhf arm-linux-gnueabihf-gcc arm-linux-gnueabihf-g++ ubuntu
@@ -101,9 +101,9 @@ linux-arm:
   stage: build
   image: parity/rust-arm:gitlab-ci
   only:
-    - stable
     - beta
     - tags
+    - stable
     - triggers
   script:
     - scripts/gitlab-build.sh arm-unknown-linux-gnueabihf arm-unknown-linux-gnueabihf armhf arm-linux-gnueabihf-gcc arm-linux-gnueabihf-g++ ubuntu
@@ -117,9 +117,9 @@ linux-aarch64:
   stage: build
   image: parity/rust-arm64:gitlab-ci
   only:
-    - stable
     - beta
     - tags
+    - stable
     - triggers
   script:
     - scripts/gitlab-build.sh aarch64-unknown-linux-gnu aarch64-unknown-linux-gnu arm64 aarch64-linux-gnu-gcc aarch64-linux-gnu-g++ ubuntu
@@ -131,7 +131,7 @@ linux-aarch64:
     name: "aarch64-unknown-linux-gnu_parity"
 linux-snap:
   stage: build
-  image: parity/snapcraft:gitlab-ci
+  image: snapcore/snapcraft:stable
   only:
     - stable
     - beta
@@ -143,15 +143,15 @@ linux-snap:
     - rust-stable
   artifacts:
     paths:
-    - snap/parity.zip
+    - parity.zip
     name: "stable-x86_64-unknown-snap-gnu_parity"
   allow_failure: true
 darwin:
   stage: build
   only:
-    - stable
     - beta
     - tags
+    - stable
     - triggers
   script:
     - scripts/gitlab-build.sh x86_64-apple-darwin x86_64-apple-darwin macos gcc g++ macos
@@ -167,9 +167,9 @@ windows:
     untracked: true
   stage: build
   only:
-    - stable
     - beta
     - tags
+    - stable
     - triggers
   script:
     - sh scripts/gitlab-build.sh x86_64-pc-windows-msvc x86_64-pc-windows-msvc installer "" "" windows
@@ -182,14 +182,12 @@ windows:
 docker-build:
   stage: build
   only:
-    - stable
-    - beta
     - tags
     - triggers
   before_script:
     - docker info
   script:
-    - DOCKER_TAG=$CI_BUILD_REF_NAME
+    - 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
     - scripts/docker-build.sh $DOCKER_TAG

scripts/aura-test.sh

@@ -7,6 +7,6 @@ git clone https://github.com/paritytech/parity-import-tests
 cp target/release/parity parity-import-tests/aura/parity
 cd parity-import-tests/aura
 echo "Start Aura test"
-parity import blocks.rlp --chain chain.json
-parity restore snap --chain chain.json
+./parity import blocks.rlp --chain chain.json
+./parity restore snap --chain chain.json
 echo "Aura test complete"

scripts/gitlab-build.sh

@@ -308,12 +308,13 @@ case $BUILD_PLATFORM in
   x86_64-unknown-snap-gnu)
     ARC="amd64"
     EXT="snap"
+    apt install -y expect zip
     snapcraft clean
     echo "Prepare snapcraft.yaml for build on Gitlab CI in Docker image"
     sed -i 's/git/'"$VER"'/g' snap/snapcraft.yaml
-    if [[ "$CI_BUILD_REF_NAME" = "stable" ]];
+    if [[ "$CI_BUILD_REF_NAME" = "beta" || "$VER" == *1.9* ]];
       then
-        sed -i -e 's/grade: devel/grade: stable/' snap/snapcraft.yaml;
+        sed -i -e 's/grade: devel/grade: beta/' snap/snapcraft.yaml;
     fi
     mv -f snap/snapcraft.yaml snapcraft.yaml
     snapcraft -d

scripts/gitlab-test.sh

@@ -23,9 +23,10 @@ rust_test () {
     then echo "Skipping Rust tests since no Rust files modified.";
     else ./test.sh || exit $?;
   fi
-  if [[ "$CI_COMMIT_REF_NAME" == "nightly" ]];
-    then sh scripts/aura-test.sh || exit $?;
-  fi
+  # if [[ "$CI_COMMIT_REF_NAME" == "nightly" ]];
+  #   ### @TODO re-enable fail after https://github.com/paritytech/parity-import-tests/issues/3
+  #   then sh scripts/aura-test.sh; # || exit $?;
+  # fi
 }
 js_test () {
   git submodule update --init --recursive

scripts/snapcraft.yaml

@@ -1,22 +0,0 @@
-name: parity
-version: master
-summary: Fast, light, robust Ethereum implementation
-description: |
-  Parity's goal is to be the fastest, lightest, and most secure Ethereum
-  client. We are developing Parity using the sophisticated and cutting-edge
-  Rust programming language. Parity is licensed under the GPLv3, and can be
-  used for all your Ethereum needs.
-
-grade: devel
-confinement: strict
-
-apps:
-  parity:
-    command: parity
-    plugs: [network, network-bind]
-
-parts:
-  parity:
-    source: ..
-    plugin: rust
-    build-packages: [g++, libudev-dev, libssl-dev, make, pkg-config]