diff --git a/.ci/azure/pipelines/obs-packaging-ci.yml b/.ci/azure/pipelines/obs-packaging-ci.yml index 3e49cfdd..2bff8abd 100644 --- a/.ci/azure/pipelines/obs-packaging-ci.yml +++ b/.ci/azure/pipelines/obs-packaging-ci.yml @@ -24,7 +24,12 @@ jobs: sudo apt-get install -y git git config --global user.email "azure-pipeline@kata.io" git config --global user.name "azure-pipeline" + .ci/packaging/setup.sh displayName: 'Setup' + env: + CI: true + branch: $(system.pullRequest.targetBranch) + GITHUB_PR: $(system.pullRequest.pullRequestNumber) - bash: | # This is set by azure, but we use the same variable diff --git a/.ci/packaging/setup.sh b/.ci/packaging/setup.sh new file mode 100755 index 00000000..980b508c --- /dev/null +++ b/.ci/packaging/setup.sh @@ -0,0 +1,19 @@ +#!/bin/bash +# +# Copyright (c) 2019 Intel Corporation +# +# SPDX-License-Identifier: Apache-2.0 +# + +set -o errexit +set -o nounset +set -o pipefail +set -o errtrace + +export GOPATH=~/go +export kata_repo="github.com/kata-containers/packaging" +export pr_number=${GITHUB_PR:-} +export pr_branch="PR_${pr_number}" + +go get github.com/kata-containers/tests +${GOPATH}/src/github.com/kata-containers/tests/.ci/resolve-kata-dependencies.sh diff --git a/scripts/lib.sh b/scripts/lib.sh index 27e1410a..f043fc0f 100644 --- a/scripts/lib.sh +++ b/scripts/lib.sh @@ -47,12 +47,14 @@ get_from_kata_deps() { else versions_file="versions-${branch}.yaml" fi + + #make sure yq is installed + install_yq >&2 + if [ ! -e "${versions_file}" ]; then yaml_url="https://raw.githubusercontent.com/kata-containers/runtime/${branch}/versions.yaml" echo "versions file (${versions_file}) does not exist" >&2 echo "Download from ${yaml_url}" >&2 - #make sure yq is installed - install_yq >&2 curl --silent -o "${versions_file}" "$yaml_url" fi result=$("${GOPATH}/bin/yq" read "$versions_file" "$dependency")