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

fidencio · 2021-05-07T13:28:06Z

This commit forces all the checks and references to point to stable-2.1
branch rather than pointing to main. This will guarantee that changes
done on main won't affect the testing of this specific branch.

Signed-off-by: Fabiano Fidêncio [email protected]

fidencio · 2021-05-07T13:28:12Z

/test

fidencio · 2021-05-07T13:33:42Z

/test

fidencio · 2021-05-07T14:44:41Z

/test

fidencio · 2021-05-07T15:30:01Z

/test-fedora

c3d

Looks good to me.

It looks like this is not documented in the release process https://github.com/kata-containers/kata-containers/blob/main/docs/Release-Process.md. Would it make sense to add it there?

fidencio · 2021-05-10T19:03:44Z

Looks good to me.

It looks like this is not documented in the release process https://github.com/kata-containers/kata-containers/blob/main/docs/Release-Process.md. Would it make sense to add it there?

It'd make sense to, somehow, automate it, in the same way we did for the kata-deploy versions.
I'll take care of opening an issue and work on that as time allows. Thanks for the suggestion!

cmaf

@fidencio nit: extra slash in readme

cmaf · 2021-05-10T19:13:46Z

README.md

@@ -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).


@fidencio there is an extra forward slash in this line

Thanks, fixed!

fidencio · 2021-05-10T19:25:18Z

/test

fidencio · 2021-05-10T20:17:59Z

/test

snir911 · 2021-05-11T07:10:04Z

@fidencio, thanks, why does this last merge commit is needed?

As we still didn't get CRI-O unit tests to run against shimv2, we removed those from our tree as part 816aee4. However, we left some documentation behind and that will break the static check. Fixes: kata-containers#3505 Backport of kata-containers#3506 Signed-off-by: Fabiano Fidêncio <[email protected]>

This commit forces all the checks and references to point to stable-2.1 branch rather than pointing to `main`. This will guarantee that changes done on `main` won't affect the testing of this specific branch. Fixes: kata-containers#3507 Signed-off-by: Fabiano Fidêncio <[email protected]>

fidencio · 2021-05-11T07:24:02Z

@fidencio, thanks, why does this last merge commit is needed?

I must admit I don't understand why GitHub doesn't understand my rebase atop of stable-2.1. I just rebased and pushed again and this is what I see:

That's the reason why we ended up with a merge commit.

fidencio · 2021-05-11T07:25:22Z

@fidencio, thanks, why does this last merge commit is needed?

I must admit I don't understand why GitHub doesn't understand my rebase atop of stable-2.1. I just rebased and pushed again and this is what I see:

That's the reason why we ended up with a merge commit.

D'uh! I opened this PR against main. That's the reason. Let me go and brew more energy.

fidencio · 2021-05-11T07:25:51Z

/test

snir911

LGTM

fidencio · 2021-05-11T07:43:07Z

@wainersm, since we merged the ability to use a cached kernel I've noticed failures like:

09:40:32 I am ubuntu or debian
09:40:32 INFO: Configure chrony file /tmp/jenkins/workspace/kata-containers-tests-ubuntu-PR-cloud-hypeprvisor-k8s-containerd/go/src/github.com/kata-containers/kata-containers/tools/osbuilder/ubuntu_rootfs/etc/chrony/chrony.conf
09:40:32 /tmp/jenkins/workspace/kata-containers-tests-ubuntu-PR-cloud-hypeprvisor-k8s-containerd/go/src/github.com/kata-containers/kata-containers/tools/osbuilder/rootfs-builder/rootfs.sh: line 576: rustup: command not found
09:40:32 /tmp/jenkins/workspace/kata-containers-tests-ubuntu-PR-cloud-hypeprvisor-k8s-containerd/go/src/github.com/kata-containers/tests /tmp/jenkins/workspace/kata-containers-tests-ubuntu-PR-cloud-hypeprvisor-k8s-containerd/go/src/github.com/kata-containers/kata-containers/tools/osbuilder
09:40:32 /tmp/jenkins/workspace/kata-containers-tests-ubuntu-PR-cloud-hypeprvisor-k8s-containerd/go/src/github.com/kata-containers/kata-containers/tools/osbuilder
09:40:32 INFO: Build agent
09:40:32 /tmp/jenkins/workspace/kata-containers-tests-ubuntu-PR-cloud-hypeprvisor-k8s-containerd/go/src/github.com/kata-containers/kata-containers/src/agent /tmp/jenkins/workspace/kata-containers-tests-ubuntu-PR-cloud-hypeprvisor-k8s-containerd/go/src/github.com/kata-containers/kata-containers/tools/osbuilder
09:40:32 INFO: checkout failed!
09:40:32 make[1]: Entering directory '/tmp/jenkins/workspace/kata-containers-tests-ubuntu-PR-cloud-hypeprvisor-k8s-containerd/go/src/github.com/kata-containers/kata-containers/src/agent'
09:40:32 /bin/sh: 1: cargo: not found
09:40:32 make[1]: cargo: Command not found
09:40:32 Makefile:153: recipe for target 'clean' failed
09:40:32 make[1]: *** [clean] Error 127
09:40:32 make[1]: Leaving directory '/tmp/jenkins/workspace/kata-containers-tests-ubuntu-PR-cloud-hypeprvisor-k8s-containerd/go/src/github.com/kata-containers/kata-containers/src/agent'
09:40:32 Makefile:87: recipe for target '/tmp/jenkins/workspace/kata-containers-tests-ubuntu-PR-cloud-hypeprvisor-k8s-containerd/go/src/github.com/kata-containers/kata-containers/tools/osbuilder/.ubuntu_rootfs.done' failed
09:40:32 make: *** [/tmp/jenkins/workspace/kata-containers-tests-ubuntu-PR-cloud-hypeprvisor-k8s-containerd/go/src/github.com/kata-containers/kata-containers/tools/osbuilder/.ubuntu_rootfs.done] Error 2
09:40:32 Failed at 44: sudo -E USE_DOCKER="${use_docker}" DISTRO="${distro}" make -e "${target_image}"
09:40:32 Failed at 22: "${cidir}/install_kata_image.sh" "${tag}"

I would like to believe those are not related, I really do, but I think those can be.
Are we short-circuiting somewhere? Are we skipping too early in the process that we don't get things properly installed?

This comes from http://jenkins.katacontainers.io/job/kata-containers-tests-ubuntu-PR-cloud-hypeprvisor-k8s-containerd/251/

fidencio · 2021-05-11T08:30:58Z

/test

fidencio · 2021-05-11T08:31:20Z

I had to close and re-open because some checks were stuck.

fidencio · 2021-05-11T08:49:31Z

@wainersm, since we merged the ability to use a cached kernel I've noticed failures like:

09:40:32 I am ubuntu or debian
09:40:32 INFO: Configure chrony file /tmp/jenkins/workspace/kata-containers-tests-ubuntu-PR-cloud-hypeprvisor-k8s-containerd/go/src/github.com/kata-containers/kata-containers/tools/osbuilder/ubuntu_rootfs/etc/chrony/chrony.conf
09:40:32 /tmp/jenkins/workspace/kata-containers-tests-ubuntu-PR-cloud-hypeprvisor-k8s-containerd/go/src/github.com/kata-containers/kata-containers/tools/osbuilder/rootfs-builder/rootfs.sh: line 576: rustup: command not found
09:40:32 /tmp/jenkins/workspace/kata-containers-tests-ubuntu-PR-cloud-hypeprvisor-k8s-containerd/go/src/github.com/kata-containers/tests /tmp/jenkins/workspace/kata-containers-tests-ubuntu-PR-cloud-hypeprvisor-k8s-containerd/go/src/github.com/kata-containers/kata-containers/tools/osbuilder
09:40:32 /tmp/jenkins/workspace/kata-containers-tests-ubuntu-PR-cloud-hypeprvisor-k8s-containerd/go/src/github.com/kata-containers/kata-containers/tools/osbuilder
09:40:32 INFO: Build agent
09:40:32 /tmp/jenkins/workspace/kata-containers-tests-ubuntu-PR-cloud-hypeprvisor-k8s-containerd/go/src/github.com/kata-containers/kata-containers/src/agent /tmp/jenkins/workspace/kata-containers-tests-ubuntu-PR-cloud-hypeprvisor-k8s-containerd/go/src/github.com/kata-containers/kata-containers/tools/osbuilder
09:40:32 INFO: checkout failed!
09:40:32 make[1]: Entering directory '/tmp/jenkins/workspace/kata-containers-tests-ubuntu-PR-cloud-hypeprvisor-k8s-containerd/go/src/github.com/kata-containers/kata-containers/src/agent'
09:40:32 /bin/sh: 1: cargo: not found
09:40:32 make[1]: cargo: Command not found
09:40:32 Makefile:153: recipe for target 'clean' failed
09:40:32 make[1]: *** [clean] Error 127
09:40:32 make[1]: Leaving directory '/tmp/jenkins/workspace/kata-containers-tests-ubuntu-PR-cloud-hypeprvisor-k8s-containerd/go/src/github.com/kata-containers/kata-containers/src/agent'
09:40:32 Makefile:87: recipe for target '/tmp/jenkins/workspace/kata-containers-tests-ubuntu-PR-cloud-hypeprvisor-k8s-containerd/go/src/github.com/kata-containers/kata-containers/tools/osbuilder/.ubuntu_rootfs.done' failed
09:40:32 make: *** [/tmp/jenkins/workspace/kata-containers-tests-ubuntu-PR-cloud-hypeprvisor-k8s-containerd/go/src/github.com/kata-containers/kata-containers/tools/osbuilder/.ubuntu_rootfs.done] Error 2
09:40:32 Failed at 44: sudo -E USE_DOCKER="${use_docker}" DISTRO="${distro}" make -e "${target_image}"
09:40:32 Failed at 22: "${cidir}/install_kata_image.sh" "${tag}"

I would like to believe those are not related, I really do, but I think those can be.
Are we short-circuiting somewhere? Are we skipping too early in the process that we don't get things properly installed?

This comes from http://jenkins.katacontainers.io/job/kata-containers-tests-ubuntu-PR-cloud-hypeprvisor-k8s-containerd/251/

Still about this, @jcvenegas, @likebreath, have you faced this before?

fidencio requested a review from a team as a code owner May 7, 2021 13:28

fidencio added the wip Work in Progress (PR incomplete - needs more work or rework) label May 7, 2021

fidencio force-pushed the wip/refer-to-stable-2.1-branch-on-stable-2.1-branch-content branch from fc23172 to adeda4d Compare May 7, 2021 13:30

fidencio force-pushed the wip/refer-to-stable-2.1-branch-on-stable-2.1-branch-content branch from adeda4d to 150e3b0 Compare May 7, 2021 14:44

fidencio removed the wip Work in Progress (PR incomplete - needs more work or rework) label May 7, 2021

c3d approved these changes May 10, 2021

View reviewed changes

cmaf reviewed May 10, 2021

View reviewed changes

fidencio force-pushed the wip/refer-to-stable-2.1-branch-on-stable-2.1-branch-content branch from 150e3b0 to cb01516 Compare May 10, 2021 19:24

fidencio added 2 commits May 11, 2021 09:19

fidencio force-pushed the wip/refer-to-stable-2.1-branch-on-stable-2.1-branch-content branch from 73f85c4 to f597ebe Compare May 11, 2021 07:19

fidencio changed the base branch from main to stable-2.1 May 11, 2021 07:24

snir911 approved these changes May 11, 2021

View reviewed changes

fidencio mentioned this pull request May 11, 2021

stable-2.1 | ci: workaround to fix arm ci failure. #3513

Merged

fidencio added the backport Change from a newer branch / repository label May 11, 2021

fidencio closed this May 11, 2021

fidencio reopened this May 11, 2021

c3d mentioned this pull request May 11, 2021

Release process: bump version numbers on stable branch kata-containers/kata-containers#1823

Closed

fidencio merged commit 381caab into kata-containers:stable-2.1 May 11, 2021

fidencio mentioned this pull request May 12, 2021

[stable-2.1] Refer to stable-2.1 branch instead of main, for content that's part of stable-2.1 branch #3507

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

fidencio commented May 7, 2021

fidencio commented May 7, 2021

fidencio commented May 7, 2021

fidencio commented May 7, 2021

fidencio commented May 7, 2021

c3d left a comment

fidencio commented May 10, 2021

cmaf left a comment

cmaf May 10, 2021

fidencio May 10, 2021

fidencio commented May 10, 2021

fidencio commented May 10, 2021

snir911 commented May 11, 2021

fidencio commented May 11, 2021

fidencio commented May 11, 2021

fidencio commented May 11, 2021

snir911 left a comment

fidencio commented May 11, 2021 •

edited

Loading

fidencio commented May 11, 2021

fidencio commented May 11, 2021

fidencio commented May 11, 2021

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

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

Conversation

fidencio commented May 7, 2021

fidencio commented May 7, 2021

fidencio commented May 7, 2021

fidencio commented May 7, 2021

fidencio commented May 7, 2021

c3d left a comment

Choose a reason for hiding this comment

fidencio commented May 10, 2021

cmaf left a comment

Choose a reason for hiding this comment

cmaf May 10, 2021

Choose a reason for hiding this comment

fidencio May 10, 2021

Choose a reason for hiding this comment

fidencio commented May 10, 2021

fidencio commented May 10, 2021

snir911 commented May 11, 2021

fidencio commented May 11, 2021

fidencio commented May 11, 2021

fidencio commented May 11, 2021

snir911 left a comment

Choose a reason for hiding this comment

fidencio commented May 11, 2021 • edited Loading

fidencio commented May 11, 2021

fidencio commented May 11, 2021

fidencio commented May 11, 2021

fidencio commented May 11, 2021 •

edited

Loading