diff --git a/.woodpecker/.test.yaml b/.woodpecker/.test.yaml index decd5f7..916e984 100644 --- a/.woodpecker/.test.yaml +++ b/.woodpecker/.test.yaml @@ -10,16 +10,6 @@ variables: - &image 'git.verdigado.com/verdigado-images/container-pre-commit:${CI_COMMIT_SHA}' steps: - await-image: - image: alpine - environment: - IMAGE: *image - commands: - - echo -${CI_COMMIT_SHA}- - - apk add --update --no-cache img - - 'while !(( img pull $IMAGE 2>&1 | grep --quiet "Error: failed to unmount" )) ; do echo "Awaiting image $IMAGE..."; sleep 3; done' - - echo 'found.' - salt clone: image: woodpeckerci/plugin-git settings: @@ -29,6 +19,15 @@ steps: ref: refs/heads/master branch: master + await-image: + image: alpine + environment: + IMAGE: *image + commands: + - echo -${CI_COMMIT_SHA}- + - apk add --update --no-cache img + - 'while !(( img pull $IMAGE 2>&1 | grep "Error: failed to unmount" )) ; do echo "Awaiting image $IMAGE..."; sleep 1; done' + salt pre-commit: image: *image depends_on: @@ -39,23 +38,3 @@ steps: commands: - cd salt - pre-commit run --all-files - - rocketchat2matrix clone: - image: woodpeckerci/plugin-git - settings: - remote: https://git.verdigado.com/NB-Public/rocketchat2matrix.git - path: rocketchat2matrix - sha: '' - ref: refs/heads/master - branch: master - - rocketchat2matrix pre-commit: - image: *image - depends_on: - - await-image - - rocketchat2matrix clone - environment: - - SKIP=no-commit-to-branch # Ignore "don't commit to protected branch" check - commands: - - cd rocketchat2matrix - - pre-commit run --all-files