From 6534bf367eac595e5d756f21f982b0c7b61866ea Mon Sep 17 00:00:00 2001 From: Oleg Plakida Date: Thu, 2 Nov 2023 11:22:18 +0000 Subject: [PATCH] Revert 08427e3e3fb8f0b8cdda141cf0b4c3b8cf8a2910 Revert switching to linux-docker runners --- .gitlab-ci.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 33faadc9e..31fd2bce7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 @@ -73,7 +73,7 @@ cache: test: stage: test - <<: *docker-env + <<: *kubernetes-env <<: *common-refs script: - cd javascript @@ -83,7 +83,7 @@ test: build: stage: build - <<: *docker-env + <<: *kubernetes-env <<: *common-refs script: - cd javascript @@ -117,7 +117,7 @@ build: publish-test: stage: check <<: *test-refs - <<: *docker-env + <<: *kubernetes-env variables: CI_IMAGE: $BUILDAH_IMAGE script: @@ -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 @@ -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 @@ -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"