diff options
| -rw-r--r-- | screwdriver.yaml | 8 | ||||
| -rwxr-xr-x | screwdriver/update-vespa-version-in-sample-apps.sh | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/screwdriver.yaml b/screwdriver.yaml index 7cb66b9009d..bbffbd2ecde 100644 --- a/screwdriver.yaml +++ b/screwdriver.yaml @@ -95,6 +95,9 @@ jobs: - VESPA_DEPLOY_KEY - DOCKER_HUB_DEPLOY_KEY + environment: + GIT_SSH_COMMAND: "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" + steps: - get-vespa-version: | VESPA_VERSION=$(meta get vespa.version) @@ -103,10 +106,11 @@ jobs: echo "Must have valid Vespa version and reference to continue (got VESPA_VERSION=$VESPA_VERSION, VESPA_REF=$VESPA_REF)." exit 1 fi - - install-docker-client: | + - install-dependencies: | yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo - yum install -y --setopt skip_missing_names_on_install=False docker-ce docker-ce-cli containerd.io + yum install -y --setopt skip_missing_names_on_install=False docker-ce docker-ce-cli containerd.io rh-git227 docker system info + source /opt/rh/rh-git227/enable - release-rpms: | screwdriver/release-rpms.sh $VESPA_VERSION $VESPA_REF - release-container-image: | diff --git a/screwdriver/update-vespa-version-in-sample-apps.sh b/screwdriver/update-vespa-version-in-sample-apps.sh index d20e8846716..dbcb5d46c3a 100755 --- a/screwdriver/update-vespa-version-in-sample-apps.sh +++ b/screwdriver/update-vespa-version-in-sample-apps.sh @@ -45,10 +45,6 @@ set +x ssh-add <(echo $SAMPLE_APPS_DEPLOY_KEY | base64 -d) set -x -# Supported from git 2.3 -export GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" -git --version - git clone git@github.com:vespa-engine/sample-apps.git cd sample-apps |