Skip to content
This repository has been archived by the owner on Jun 28, 2024. It is now read-only.

ci: Refer to stable-2.1 branch on stable-2.1 branch #3504

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci/lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export KATA_ETC_CONFIG_PATH="/etc/kata-containers/configuration.toml"

export kata_repo="github.com/kata-containers/kata-containers"
export kata_repo_dir="${GOPATH}/src/${kata_repo}"
export kata_default_branch="${kata_default_branch:-main}"
export kata_default_branch="${kata_default_branch:-stable-2.1}"
export timeout="90s"


Expand Down
8 changes: 4 additions & 4 deletions .ci/static-checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ typeset -r arch_func_regex="_arch_specific$"
repo=""
specific_branch="false"
force="false"
branch=${branch:-main}
branch=${branch:-stable-2.1}

# Which static check functions to consider.
handle_funcs="all"
Expand Down Expand Up @@ -232,7 +232,7 @@ static_check_commits()
# for master branch
# (cd "${tests_repo_dir}" && make checkcommits)
# for main branch
(cd "${tests_repo_dir}" && make checkcommits && git remote set-branches origin 'main' && git fetch -v)
(cd "${tests_repo_dir}" && make checkcommits && git remote set-branches origin 'stable-2.1' && git fetch -v)

# Check the commits in the branch
{
Expand All @@ -242,7 +242,7 @@ static_check_commits()
--ignore-fixes-for-subsystem "release" \
--verbose \
HEAD \
main; \
stable-2.1; \
rc="$?";
} || true

Expand Down Expand Up @@ -1202,7 +1202,7 @@ main()
for func in $all_check_funcs
do
if [ "$func" = "static_check_commits" ]; then
if [ -n "$TRAVIS_BRANCH" ] && [ "$TRAVIS_BRANCH" != "main" ]
if [ -n "$TRAVIS_BRANCH" ] && [ "$TRAVIS_BRANCH" != "stable-2.1" ]
then
echo "Skipping checkcommits"
echo "See issue: https://github.com/kata-containers/tests/issues/632"
Expand Down
11 changes: 5 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,10 @@ We provide several tests to ensure Kata-Containers run on different scenarios
and with different container managers.

1. Integration tests to ensure compatibility with:
- [Kubernetes](https://github.com/kata-containers/tests/tree/main/integration/kubernetes)
- [CRI-O](https://github.com/kata-containers/tests/tree/main/integration/cri-o)
- [Containerd](https://github.com/kata-containers/tests/tree/main/integration/containerd)
2. [Stability tests](https://github.com/kata-containers/tests/tree/main/integration/stability)
3. [Metrics](https://github.com/kata-containers/tests/tree/main/metrics)
- [Kubernetes](https://github.com/kata-containers/tests/tree/stable-2.1/integration/kubernetes)
- [Containerd](https://github.com/kata-containers/tests/tree/stable-2.1/integration/containerd)
2. [Stability tests](https://github.com/kata-containers/tests/tree/stable-2.1/integration/stability)
3. [Metrics](https://github.com/kata-containers/tests/tree/stable-2.1/metrics)

## CI Content

Expand Down Expand Up @@ -160,7 +159,7 @@ You need to install the following to run Kata Containers tests:
- [golang](https://golang.org/dl)

To view the versions of go known to work, see the `golang` entry in the
[versions database](https://github.com/kata-containers/kata-containers/blob/main/versions.yaml).
[versions database](https://github.com/kata-containers/kata-containers/blob/stable-2.1/versions.yaml).

- `make`.

Expand Down
2 changes: 1 addition & 1 deletion cmd/github-labels/labels.yaml.in
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ categories:
- name: related
description: |
Related project. Base set can be generated from
https://github.com/kata-containers/kata-containers/blob/main/versions.yaml.
https://github.com/kata-containers/kata-containers/blob/stable-2.1/versions.yaml.

- name: release
description: Related to production of new versions.
Expand Down
2 changes: 1 addition & 1 deletion cmd/pmemctl/pmemctl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ create_file() {
local block_size=4096
local data_offset=$((1024*1024*2))
local dax_alignment=$((1024*1024*2))
local nsdax_src_url="https://raw.githubusercontent.com/kata-containers/kata-containers/main/tools/osbuilder/image-builder/nsdax.gpl.c"
local nsdax_src_url="https://raw.githubusercontent.com/kata-containers/kata-containers/stable-2.1/tools/osbuilder/image-builder/nsdax.gpl.c"

truncate -s "${SIZE}" "${FILE}"
if [ $((($(stat -c '%s' "${FILE}")/1024/1024)%128)) -ne 0 ]; then
Expand Down
2 changes: 1 addition & 1 deletion versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ description: |
This file contains test specific version details.
For other version details, see the main database:

https://github.com/kata-containers/kata-containers/blob/main/versions.yaml
https://github.com/kata-containers/kata-containers/blob/stable-2.1/versions.yaml

docker_images:
description: "Docker hub images used for testing"
Expand Down