Skip to content

Commit

Permalink
[ci] Update buildah command and version (#2058)
Browse files Browse the repository at this point in the history 
* [ci] Update buildah command and version

* custom rules for build

* fix naming

* move all jobs to one stage

* typo >_<

* fix bridges-common-relay build image
  • Loading branch information
@alvicsam
alvicsam authored Apr 24, 2023
1 parent e4535c0 commit 660d791
Showing 1 changed file with 88 additions and 39 deletions.
127 changes: 88 additions & 39 deletions .gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
stages:
- lint
- check
- test
- build
- publish
Expand All @@ -13,8 +11,9 @@ variables:
CARGO_INCREMENTAL: 0
ARCH: "x86_64"
CI_IMAGE: "paritytech/bridges-ci:production"
BUILDAH_IMAGE: "quay.io/buildah/stable:v1.27"
RUST_BACKTRACE: full
BUILDAH_IMAGE: "quay.io/buildah/stable:v1.29"
BUILDAH_COMMAND: "buildah --storage-driver overlay2"

default:
cache: {}
Expand Down Expand Up @@ -50,23 +49,14 @@ default:

.test-refs: &test-refs
rules:
# FIXME: This is the cause why pipelines wouldn't start. The problem might be in our custom
# mirroring. This should be investigated further, but for now let's have the working
# pipeline.
# - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH
# changes:
# - '**.md'
# - diagrams/*
# - docs/*
# when: never
- if: $CI_PIPELINE_SOURCE == "pipeline"
- if: $CI_PIPELINE_SOURCE == "web"
- if: $CI_PIPELINE_SOURCE == "schedule"
- if: $CI_COMMIT_REF_NAME == "master"
- if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
- if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1

.build-refs: &build-refs
.publish-refs: &publish-refs
rules:
# won't run on the CI image update pipeline
- if: $CI_PIPELINE_SOURCE == "pipeline"
Expand All @@ -78,6 +68,12 @@ default:
# this job runs only on nightly pipeline with the mentioned variable, against `master` branch
- if: $CI_PIPELINE_SOURCE == "schedule" && $PIPELINE == "nightly"

.nightly-test: &nightly-test
rules:
# 2. another is triggered by scripts repo $CI_PIPELINE_SOURCE == "pipeline" it's for the CI image
# update, it also runs all the nightly checks.
- if: $CI_PIPELINE_SOURCE == "pipeline"

.deploy-refs: &deploy-refs
rules:
- if: $CI_PIPELINE_SOURCE == "pipeline"
Expand All @@ -89,16 +85,12 @@ default:
- if: $CI_COMMIT_REF_NAME =~ /^v[0-9]{4}-[0-9]{2}-[0-9]{2}.*$/ # i.e. v2021-09-27, v2021-09-27-1
when: manual

.nightly-test: &nightly-test
rules:
# 2. another is triggered by scripts repo $CI_PIPELINE_SOURCE == "pipeline" it's for the CI image
# update, it also runs all the nightly checks.
- if: $CI_PIPELINE_SOURCE == "pipeline"

#### stage: lint

#### stage: test

clippy-nightly:
stage: lint
stage: test
<<: *docker-env
<<: *test-refs
variables:
Expand All @@ -108,23 +100,21 @@ clippy-nightly:
- SKIP_WASM_BUILD=1 cargo +nightly clippy --all-targets -- -A clippy::redundant_closure -A clippy::derive-partial-eq-without-eq -A clippy::or_fun_call

fmt:
stage: lint
stage: test
<<: *docker-env
<<: *test-refs
script:
- cargo +nightly fmt --all -- --check

spellcheck:
stage: lint
stage: test
<<: *docker-env
<<: *test-refs
script:
- cargo spellcheck check --cfg=.config/spellcheck.toml --checkers hunspell -m 1 $(find . -type f -name '*.rs' ! -path "./target/*" ! -name 'codegen_runtime.rs' ! -name 'weights.rs')

#### stage: check

check:
stage: check
stage: test
<<: *docker-env
<<: *test-refs
script: &check-script
Expand All @@ -135,15 +125,13 @@ check:
- SKIP_WASM_BUILD=1 time cargo check -p millau-runtime --locked --features runtime-benchmarks --verbose

check-nightly:
stage: check
stage: test
<<: *docker-env
<<: *nightly-test
script:
- rustup default nightly
- *check-script

#### stage: test

test:
stage: test
<<: *docker-env
Expand Down Expand Up @@ -225,12 +213,17 @@ partial-repo-pallets-build-test:
# we may live with failing partial repo build, it is just a signal for us
allow_failure: true

#### stage: build

build:
stage: build
stage: test
rules:
# won't run on the CI image update pipeline
- if: $CI_PIPELINE_SOURCE == "pipeline"
when: never
- if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
- if: $CI_COMMIT_REF_NAME =~ /^v[0-9]{4}-[0-9]{2}-[0-9]{2}.*$/ # i.e. v2021-09-27, v2021-09-27-1
- if: $CI_PIPELINE_SOURCE == "schedule" && $PIPELINE == "nightly"
- if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
<<: *docker-env
<<: *build-refs
<<: *collect-artifacts
# master
script: &build-script
Expand Down Expand Up @@ -264,10 +257,66 @@ build-nightly:

#### stage: publish

# check that images can be built
.build-image: &build-image
<<: *kubernetes-build
image: $BUILDAH_IMAGE
<<: *test-refs
variables: &build-image-variables
GIT_STRATEGY: none
DOCKERFILE: ci.Dockerfile
needs:
- job: build
artifacts: true
script:
# trim "-build-docker" from job name
- export DOCKER_IMAGE_NAME="${CI_JOB_NAME::-13}"
- if [[ "${CI_JOB_NAME::-13}" == "bridges-common-relay" ]]; then
export BRIDGES_PROJECT="substrate-relay";
else
export BRIDGES_PROJECT="${CI_JOB_NAME::-13}";
fi
- export IMAGE_NAME=docker.io/paritytech/${DOCKER_IMAGE_NAME}
- echo "Building ${IMAGE_NAME}"
- cd ./artifacts
- $BUILDAH_COMMAND build
--format=docker
--build-arg VCS_REF="${CI_COMMIT_SHORT_SHA}"
--build-arg BUILD_DATE="$(date +%d-%m-%Y)"
--build-arg PROJECT="${BRIDGES_PROJECT}"
--build-arg VERSION="${VERSION}"
--tag "${IMAGE_NAME}:latest"
--file "${DOCKERFILE}" .

rialto-bridge-node-build-docker:
stage: publish
<<: *build-image

rialto-parachain-collator-build-docker:
stage: publish
<<: *build-image

millau-bridge-node-build-docker:
stage: publish
<<: *build-image

substrate-relay-build-docker:
stage: publish
<<: *build-image

bridges-common-relay-build-docker:
stage: publish
<<: *build-image
variables:
<<: *build-image-variables
BRIDGES_PROJECT: substrate-relay
DOCKER_IMAGE_NAME: bridges-common-relay

# build and publish images
.build-push-image: &build-push-image
<<: *kubernetes-build
image: $BUILDAH_IMAGE
<<: *build-refs
<<: *publish-refs
variables: &image-variables
GIT_STRATEGY: none
DOCKERFILE: ci.Dockerfile
Expand Down Expand Up @@ -297,7 +346,7 @@ build-nightly:
- test "${Docker_Hub_User_Parity}" -a "${Docker_Hub_Pass_Parity}" ||
( echo "no docker credentials provided"; exit 1 )
- cd ./artifacts
- buildah bud
- $BUILDAH_COMMAND build
--format=docker
--build-arg VCS_REF="${CI_COMMIT_SHORT_SHA}"
--build-arg BUILD_DATE="$(date +%d-%m-%Y)"
Expand All @@ -310,10 +359,10 @@ build-nightly:
# The job will success only on the protected branch
- echo "${Docker_Hub_Pass_Parity}" |
buildah login --username "${Docker_Hub_User_Parity}" --password-stdin docker.io
- buildah info
- buildah push --format=v2s2 "${IMAGE_NAME}:${VERSION}"
- buildah push --format=v2s2 "${IMAGE_NAME}:sha-${CI_COMMIT_SHORT_SHA}"
- buildah push --format=v2s2 "${IMAGE_NAME}:${FLOATING_TAG}"
- $BUILDAH_COMMAND info
- $BUILDAH_COMMAND push --format=v2s2 "${IMAGE_NAME}:${VERSION}"
- $BUILDAH_COMMAND push --format=v2s2 "${IMAGE_NAME}:sha-${CI_COMMIT_SHORT_SHA}"
- $BUILDAH_COMMAND push --format=v2s2 "${IMAGE_NAME}:${FLOATING_TAG}"
after_script:
- env REGISTRY_AUTH_FILE= buildah logout --all

Expand Down Expand Up @@ -343,7 +392,7 @@ bridges-common-relay:

# Publish Docker images description to hub.docker.com

.publish-docker-image-description: &publish-docker-image-description
.publish-docker-image-description:
stage: publish-docker-description
image: paritytech/dockerhub-description
variables:
Expand Down

0 comments on commit 660d791

Please sign in to comment.