Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert 08427e3e3fb8f0b8cdda141cf0b4c3b8cf8a2910 #1470

Merged
merged 1 commit into from
Nov 2, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ cache:
- javascript/package.json
- javascript/package-lock.json

.docker-env: &docker-env
.kubernetes-env: &kubernetes-env
image: $CI_IMAGE
tags:
- linux-docker
- kubernetes-parity-build

# run jobs only on PRs with changes in code.
.test-refs: &test-refs
Expand Down Expand Up @@ -73,7 +73,7 @@ cache:

test:
stage: test
<<: *docker-env
<<: *kubernetes-env
<<: *common-refs
script:
- cd javascript
Expand All @@ -83,7 +83,7 @@ test:

build:
stage: build
<<: *docker-env
<<: *kubernetes-env
<<: *common-refs
script:
- cd javascript
Expand Down Expand Up @@ -117,7 +117,7 @@ build:
publish-test:
stage: check
<<: *test-refs
<<: *docker-env
<<: *kubernetes-env
variables:
CI_IMAGE: $BUILDAH_IMAGE
script:
Expand All @@ -138,7 +138,7 @@ publish-docker-pr:
- export VERSION=${CI_COMMIT_SHORT_SHA}
- export Docker_Hub_User_Parity=$PARITYPR_USER
- export Docker_Hub_Pass_Parity=$PARITYPR_PASS
<<: *docker-env
<<: *kubernetes-env
<<: *common-refs
<<: *build-push-docker-image

Expand All @@ -152,13 +152,13 @@ publish-docker:
elif [[ "${CI_COMMIT_SHORT_SHA}" ]]; then
VERSION=${CI_COMMIT_SHORT_SHA};
fi
<<: *docker-env
<<: *kubernetes-env
<<: *publish-refs
<<: *build-push-docker-image

publish-docker-image-description:
stage: publish
<<: *docker-env
<<: *kubernetes-env
image: paritytech/dockerhub-description
variables:
DOCKER_USERNAME: $Docker_Hub_User_Parity
Expand Down Expand Up @@ -190,7 +190,7 @@ publish-docker-image-description:
needs:
- job: publish-docker-pr
extends:
- .docker-env
- .kubernetes-env
- .test-refs
variables:
LOCAL_DIR: "/builds/parity/mirrors/zombienet/tests"
Expand Down
Loading