Always rebase on master before running a job (#4616)
parent
fc072300ea
commit
38a3075025
|
@ -29,6 +29,7 @@ variables:
|
|||
LOG_LEVEL: "-vv"
|
||||
|
||||
before_script:
|
||||
- ./tests/scripts/rebase.sh
|
||||
- /usr/bin/python -m pip install -r tests/requirements.txt
|
||||
- mkdir -p /.ssh
|
||||
|
||||
|
@ -42,6 +43,7 @@ before_script:
|
|||
services:
|
||||
- docker:dind
|
||||
before_script:
|
||||
- ./tests/scripts/rebase.sh
|
||||
- ./tests/scripts/testcases_prepare.sh
|
||||
script:
|
||||
- ./tests/scripts/testcases_run.sh
|
||||
|
|
|
@ -5,6 +5,7 @@ shellcheck:
|
|||
variables:
|
||||
SHELLCHECK_VERSION: v0.6.0
|
||||
before_script:
|
||||
- ./tests/scripts/rebase.sh
|
||||
- curl --silent "https://storage.googleapis.com/shellcheck/shellcheck-"${SHELLCHECK_VERSION}".linux.x86_64.tar.xz" | tar -xJv
|
||||
- cp shellcheck-"${SHELLCHECK_VERSION}"/shellcheck /usr/bin/
|
||||
- shellcheck --version
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
.terraform_install:
|
||||
extends: .job
|
||||
before_script:
|
||||
- ./tests/scripts/rebase.sh
|
||||
# Set Ansible config
|
||||
- cp ansible.cfg ~/.ansible.cfg
|
||||
# Install Terraform
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
#!/bin/bash
|
||||
set -euxo pipefail
|
||||
|
||||
# Rebase on master to get latest changes
|
||||
git config user.email "ci@kubespray.io"
|
||||
git config user.name "CI"
|
||||
git pull --rebase origin master
|
Loading…
Reference in New Issue