Commit Graph

265 Commits

Author SHA1 Message Date
Graham Whaley
d3e3d9c32a
Merge pull request #197 from bergwolf/fix-release
release: fix release scripts issues found in 1.3.0 and bump package versions
2018-10-02 10:41:41 +01:00
Jose Carlos Venegas Munoz
356de607fa
Merge pull request #194 from marcov/qemu-version
obs-packaging: fix runtime qemu-* required version
2018-10-01 10:57:13 -05:00
Peng Tao
18d126b8ed versions: bump package versions for 1.3.0 release
Packages are already pushed to obs.

Signed-off-by: Peng Tao <bergwolf@gmail.com>
2018-09-29 11:35:10 +08:00
Peng Tao
4338886211 obs-package: rename kernel to linux-container
We are using linux-container repo in the subproject.

Signed-off-by: Peng Tao <bergwolf@gmail.com>
2018-09-29 11:35:10 +08:00
Peng Tao
e30e2e8a01 osc: test alternative oscrc locations
On ubuntu, it exists at ~/.config/osc/oscrc instead.

Signed-off-by: Peng Tao <bergwolf@gmail.com>
2018-09-29 11:09:32 +08:00
Peng Tao
e074aa1099 spec: add kata-netmon to rpm spec
So that it is included in the package.

Signed-off-by: Peng Tao <bergwolf@gmail.com>
2018-09-29 11:09:32 +08:00
Peng Tao
71c693ccac release: only set LIBEXECDIR for kata-shim
It is the only repo that requires LIBEXECDIR. Do not set it
for other repos, otherwise the runtime repo will mistakenly install
kata-netmon in a wrong path.

Signed-off-by: Peng Tao <bergwolf@gmail.com>
2018-09-29 11:09:32 +08:00
Peng Tao
4672721efa static-build: do not make clean in qemu Dockerfile
It fails with:
step 13/16 : RUN make clean
 ---> Running in 5385ba104ad8
find: '/root/qemu/tests/docker/dockerfiles/debian-alpha-cross.docker': No such file or directory
find: '/root/qemu/tests/docker/dockerfiles/debian-hppa-cross.docker': No such file or directory
find: '/root/qemu/tests/docker/dockerfiles/debian-m68k-cross.docker': No such file or directory
find: '/root/qemu/tests/docker/dockerfiles/debian-mips64-cross.docker': No such file or directory
find: '/root/qemu/tests/docker/dockerfiles/debian-powerpc-user-cross.docker': No such file or directory
find: '/root/qemu/tests/docker/dockerfiles/debian-riscv64-cross.docker': No such file or directory
find: '/root/qemu/tests/docker/dockerfiles/debian-sh4-cross.docker': No such file or directory
find: '/root/qemu/tests/docker/dockerfiles/debian-sid.docker': No such file or directory
find: '/root/qemu/tests/docker/dockerfiles/debian-sparc64-cross.docker': No such file or directory
find: '/root/qemu/tests/docker/dockerfiles/debian-tricore-cross.docker': No such file or directory
find: '/root/qemu/tests/docker/dockerfiles/fedora-i386-cross.docker': No such file or directory
find: '/root/qemu/tests/docker/test-debug': No such file or directory
find: '/root/qemu/tests/docker/test-unit': No such file or directory

Signed-off-by: Peng Tao <bergwolf@gmail.com>
2018-09-29 11:09:32 +08:00
Peng Tao
5188ed2d71 tag_repos: tag prerelease for rc releases
So the they are shown as prerelease on github.

Signed-off-by: Peng Tao <bergwolf@gmail.com>
2018-09-29 11:08:24 +08:00
Peng Tao
f4feba9a9f release: fix release tag check
We should make sure ${tag} fully matches otherwise we cannot
differentiate `1.3.0` vs. `1.3.0-rc1`, nor `1.3.0` vs. `11.3.0`.

Fixes: #196

Signed-off-by: Peng Tao <bergwolf@gmail.com>
2018-09-27 19:53:43 +08:00
James O. D. Hunt
01b68b1ca6
Merge pull request #192 from nitkon/master
runtime: Skip qemu-lite dependency for non-amd64 packaging
2018-09-27 08:22:10 +01:00
Nitesh Konkar
7fa02b2ef5 runtime: Skip qemu-lite dependency for non-amd64 packaging
Non-amd64 arch need not have qemu-lite as part of
their packaging dependency.

Fixes: #191

Signed-off-by: Nitesh Konkar niteshkonkar@in.ibm.com
2018-09-26 22:47:06 +05:30
Marco Vedovati
dfabc9f08c obs-packaging: fix runtime qemu-* required version
The kata-runtime spec file, when specifying a `Requires:` version for
qemu-lite and qemu-vanilla, does not include the "+git.<commit hash>"
part.
As a result of this, versions of kata-runtime and qemu installed on a
system using RPM package management may be inconsistent.

Fixes: #193

Signed-off-by: Marco Vedovati <mvedovati@suse.com>
2018-09-26 17:38:50 +02:00
Julio Montes
6613fc58b3
Merge pull request #190 from nitkon/makefail
obs-packaging: Fix "make test-packaging-tools" failure
2018-09-21 11:10:25 -05:00
Nitesh Konkar
a3080b8d47 obs-packaging: Fix "make test-packaging-tools" failure
unable to prepare context, unable to evaluate symlinks
in context path when building target test-packaging-tools
on ppc64le.

Fixes: #189

Signed-off-by: Nitesh Konkar niteshkonkar@in.ibm.com
2018-09-21 20:08:52 +05:30
Julio Montes
66c1c78ba9
Merge pull request #188 from nitkon/Makefile
Makefile: Do not error out on "make clean"
2018-09-21 08:03:10 -05:00
Nitesh Konkar
9575f771aa Makefile: Do not error out on "make clean"
"make clean" errors out if snap/snapcraft.yaml file
does not exsist and the recipe for target 'clean'
fails. Avoid this my adding a "-f" option to rm to
have a clean state.

Fixes: #187

Signed-off-by: Nitesh Konkar niteshkonkar@in.ibm.com
2018-09-21 18:05:06 +05:30
James O. D. Hunt
f66ecea9ec
Merge pull request #186 from devimc/topic/shpc
kernel: enable SHPC
2018-09-20 16:04:43 +01:00
Julio Montes
b882d19a44 kernel: enable SHPC
SHPC is need to support hotplug in q35

fixes #185

Signed-off-by: Julio Montes <julio.montes@intel.com>
2018-09-20 07:54:34 -05:00
Graham Whaley
4d545625ba
Merge pull request #182 from jcvenegas/kata-1.3-rc0
Kata 1.3 rc0
2018-09-18 11:55:11 +01:00
Jose Carlos Venegas Munoz
4b8f97c1ca
Merge pull request #184 from devimc/topic/fixSnap130
snap: fix snapcraft.yaml for kata-container 1.3.0
2018-09-14 14:23:05 -05:00
Julio Montes
e63f8a08de snap: fix snapcraft.yaml for kata-container 1.3.0
fix proxy installation path
fix initrd creation

fixes #183

Signed-off-by: Julio Montes <julio.montes@intel.com>
2018-09-14 14:05:42 -05:00
Jose Carlos Venegas Munoz
d109f99ac8 release: 1.3.0-rc1.
- Update versions file.
- Fix proxy installation in static tarball.
- Fix ksm-throttler spec path.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-09-13 21:20:21 -05:00
Jose Carlos Venegas Munoz
c60d1b73af versions: Update release version.
Update versions file to Kata 1.3-0-rc1.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-09-10 15:08:03 -05:00
Jose Carlos Venegas Munoz
f303311d01 obs: image: fix tarball name.
We find for the tarball name with the package name.

If this is a `-rc` tha package versoin will have `~rc`,
lets replace `~` for `-` before get the tarball name.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-09-10 10:58:03 -05:00
Jose Carlos Venegas Munoz
c04f9bed14 kata-static: Fix shim installation
Shim install does not suport destdir

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-09-10 10:56:43 -05:00
James O. D. Hunt
7dd00a1d36
Merge pull request #180 from jcvenegas/semver-replace
packaging: Replace `-` for `~`
2018-09-07 09:14:12 +01:00
Jose Carlos Venegas Munoz
368f4792a9 packaging: Replace - for ~
Replace non-valid character from kata version.

This will make the version compatible with rpmbuild.

Fixes: #179

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-09-06 12:33:05 -05:00
Jose Carlos Venegas Munoz
4cb3083cd4
Merge pull request #177 from ydjainopensource/s390x
packaging : add support for s390x
2018-09-04 10:30:48 -05:00
Yash Jain
b7c362fbdb packaging : add support for s390x
Add kernel 4.14.x config for s390x.
This is taken from https://github.com/linuxkit/linuxkit/blob/master/kernel/config-4.14.x-s390x
commit 323043fdd843d0ef920e5348f6e1315039e1f1d3
Also a minor mod was made to this file to disable CONFIG_SERIAL_8250.

Fixes #176

Signed-off-by: Yash Jain <ydjainopensource@gmail.com>
2018-09-04 09:29:16 -04:00
James O. D. Hunt
f4de4838f2
Merge pull request #175 from kata-containers/release-notes-fixup
Release notes fixup
2018-09-03 16:01:06 +01:00
Eric Ernst
64509a5a21 release: notes: add shortlog for reach repo
Signed-off-by: Eric Ernst <eric.ernst@intel.com>
2018-08-31 15:40:19 -07:00
Eric Ernst
9a14155bcd release: fix release note automation version info
Make sure we checkout the new_version tag before grabbing version
information from the runtime repository.

Fixes: #174.

Signed-off-by: Eric Ernst <eric.ernst@intel.com>
2018-08-31 14:58:02 -07:00
Jose Carlos Venegas Munoz
c395aa9ccb obs: proxy: use DESTDIR variable.
Proxy respository now honor DESTDIR variable.

Fixes: #172

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-31 12:53:26 -07:00
Eric Ernst
9ed9792091
Merge pull request #170 from jcvenegas/release-notes
release: Add release notes automation.
2018-08-31 10:44:52 -07:00
Eric Ernst
3749be761b
Merge pull request #168 from jcvenegas/check-image-sha
Check agent commit id when image is generated.
2018-08-31 08:44:53 -07:00
Jose Carlos Venegas Munoz
7d23484827 release: Add release notes automation.
Add script to generate release notes template
for runtime.

Will get the range of changes from two tags.

Get assets information from versions.yaml file.

Fixes: #169

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-31 10:21:26 -05:00
Jose Carlos Venegas Munoz
985f88e763 obs: pkglib: dont grep if file does not exit.
When tries to get release number from a new repo, the
specfile wont exist. Dont do grep in this case.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-30 20:58:45 -05:00
Jose Carlos Venegas Munoz
3d06a83814 obs: makefile: fix clean target.
Clean target tries to remove files multiples times.

Limit find max depth to not try to remove files more than once.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-30 20:57:05 -05:00
Jose Carlos Venegas Munoz
33214c90d6 image: Make sure agent sha is correct
Fix image generation.

Instead of use agent code from the host checkout to the
agent source code in a clean GOPATH env.

Make sure that the agent `commit id` is the correct before
push to github or OBS.

Fixes: #166

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-30 20:56:50 -05:00
James O. D. Hunt
fe2d20ee4f
Merge pull request #164 from jcvenegas/fix-tag-multi-branch
release: tag: checkout to branch to tag.
2018-08-30 08:45:20 +01:00
Jose Carlos Venegas Munoz
88ce6e027d release: tag: checkout to branch to tag.
Checkout to a target branch before create a tag.

We dont checkout for repos that does not have stable branches.
We want to do is just push the tags to master branch
since we don't maintain a seperate one.

The repos are:

osbuilder
packaging
ksm-throttler

Fixes: #163

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-29 15:13:20 -05:00
Julio Montes
c2c7c1c513
Merge pull request #162 from jcvenegas/fix-qemu-vanilla-rng
obs: qemu-vanilla: point to qemu repository.
2018-08-29 13:17:36 -05:00
Jose Carlos Venegas Munoz
953ec99bae obs: qemu-vanilla: point to qemu repository.
Lets point to qemu repository instead of kata fork
for qemu-vanilla.

Fixes: #161

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-29 09:44:06 -05:00
Jose Carlos Venegas Munoz
6d6d669fd2 obs: get_versions: fix qemu-vanilla sha.
The qemu vanilla sha was incorrect.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-29 09:44:06 -05:00
James O. D. Hunt
54164dd62f
Merge pull request #159 from jcvenegas/release-tag-osbuilder-not-check
release: dont check osbuilder VERSION file.
2018-08-29 15:05:18 +01:00
Jose Carlos Venegas Munoz
a2a36599a0 release: dont check osbuilder VERSION file.
The osbuilder version file wont be the same if
we tag a stable branch. But we still want to tag
the HEAD of osbuilder to do reproducible builds of
a Kata branch.

Fixes: #158

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-28 13:09:58 -05:00
Julio Montes
65e57d45f3
Merge pull request #140 from jcvenegas/obs-branch-repo-creator
obs: create-repo-branch.sh: New script to create OBS repos.
2018-08-28 12:59:49 -05:00
Jose Carlos Venegas Munoz
c2e29904b3
Merge pull request #155 from nitkon/master
obs-packaging: set BUILD_ARCH, DEB_ARCH arch specific
2018-08-28 12:45:50 -05:00
Jose Carlos Venegas Munoz
65c581ed61 release: get current version before modify file.
When we get changes from one version to a newer this
is empty because we dont get the current version.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-28 11:33:45 -05:00