Commit Graph

205 Commits

Author SHA1 Message Date
Nitesh Konkar
d72fb8f397 obs-packaging: Skip packaging qemu-lite for non-amd64 arch
qemu-lite is required to be packaged only
for amd64 arch. Skip it for all other
architectures.

Fixes: #152

Signed-off-by: Nitesh Konkar niteshkonkar@in.ibm.com
2018-08-27 23:30:25 +05:30
Salvador Fuentes
a7ec33d0ff
Merge pull request #146 from nitkon/patch-3
Dockerfile: Install pcre-tools later to avoid dependency issue
2018-08-27 09:19:46 -05:00
Peng Tao
ee6ef0954a
Merge pull request #145 from WeiZhang555/kernel-4.1-config
kernel_config: add 4.1 kernel support
2018-08-25 12:29:28 +08:00
Wei Zhang
4217dde487 kernel_config: add 4.1 kernel support
Fixes #144

Current kata containers can't run with kernel 4.1 built from current x86 config,
it will report error:

```
$ docker run -ti --runtime kata busybox sh
docker: Error response from daemon: oci runtime error: rpc error: code = Internal
 desc = Could not run process: container_linux.go:348: starting container process
 caused "process_linux.go:402: container init caused \"open /dev/ptmx: no such
file or directory\"".
```

This is caused by bogus devpts mount options. When run container with docker,
docker will assign a default devpts mount for every container which equals to
command below:

```
$ mount -t devpts -o nosuid,noexec,newinstance,ptmxmode=0666,mode=0620,gid=5 \
devpts /dev/pts
```

This requires kernel config `CONFIG_DEVPTS_MULTIPLE_INSTANCES=y` to work properly
under kernel-4.1, but this option is already removed from latest kernel.

It's better to add it back for support older kernel than current 4.14.

Signed-off-by: Wei Zhang <zhangwei555@huawei.com>
2018-08-25 09:00:05 +08:00
Nitesh Konkar
17253b3bf9 Dockerfile: Install pcre-tools later to avoid dependency issue
When pcre-tools is installed before build/obs-service-tar_scm
then "build-mkbaselibs-20180629-289.1.noarch.rpm" is installed
as dependency but OBS repo does not have that rpm. So install
"pcre-tools" at the end and dockerfile builds fine on ppc64le.

Fixes:  #139

Signed-off-by: Nitesh Konkar niteshkonkar@in.ibm.com
2018-08-24 20:50:14 +05:30
Jose Carlos Venegas Munoz
98bf3ae2be
Merge pull request #143 from kata-containers/kata-deploy-1.2-update
Kata deploy 1.2 update
2018-08-22 16:07:57 -05:00
Julio Montes
6a18753dfe
Merge pull request #141 from jcvenegas/release-multi-branch
release: support release branches.
2018-08-22 08:07:13 -05:00
Eric Ernst
4d95d8d9d5 kata-deploy: use latest container image
Signed-off-by: Eric Ernst <eric.ernst@intel.com>
2018-08-21 20:56:23 -07:00
Eric Ernst
2d07689ffe kata-deploy: changes for 1.2.0 release
1.2.0 release changed the tarball file layout for the
Kata artifacts.  Adjust scripts accordingly.

Fixes: #142

Signed-off-by: Eric Ernst <eric.ernst@intel.com>
2018-08-21 20:56:14 -07:00
Jose Carlos Venegas Munoz
b78c7f8cd5 release: tag: Add option to decide what branch will be used.
The tag_repos.sh script always check master. Now when we want
to know the version of kata we may want to choose a branch to check.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-21 11:10:53 -05:00
Jose Carlos Venegas Munoz
d5e9beea78 relase: update-repository-version: add branch argument.
Kata is staring maintain mutiples braches. When we want to
update the project version now we need to have a target branch.

Add argument to choose kata branch we will use to create the PR.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-21 11:00:53 -05:00
Julio Montes
ef6a135ab3
Merge pull request #138 from jcvenegas/shfmt
format: use shfmt to format sh files.
2018-08-17 10:53:18 -05:00
Jose Carlos Venegas Munoz
7883b406ee bump: kernel config version.
Kernel directory modified.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-17 08:37:16 -05:00
Jose Carlos Venegas Munoz
2590f2b91e format: use shfmt to format sh files.
Use shfmt to format all the sh file.

https://github.com/mvdan/sh

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-16 16:45:35 -05:00
Eric Ernst
fa711da0eb
Merge pull request #126 from jcvenegas/static-builds
Kata 1.2.0 packaging
2018-08-16 13:55:15 -07:00
Jose Carlos Venegas Munoz
76c171b194
Merge pull request #136 from kata-containers/kata-deploy-1.2-dockerfile
Kata deploy 1.2 dockerfile
2018-08-16 14:05:00 -05:00
Jose Carlos Venegas Munoz
8f3eb86d52 kernel: bump kernel config version.
kernel dir was modified, bump version.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-16 11:12:01 -05:00
Eric Ernst
80ce323332 kata-deploy: update Dockerfile to 1.2.0
kata-deploy container image changed format slightly as we've changed
the release tarball.  Update to 1.2.0 and make adjustments accordingly.

Fixes: #135

Signed-off-by: Eric Ernst <eric.ernst@intel.com>
2018-08-15 15:12:25 -07:00
Jose Carlos Venegas Munoz
b0ff304461 static: qemu: point prefix variable to /opt/kata.
We want all the static qemu is intalled in /opt/kata
use PREFIX variable to notify to configure script.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-15 16:53:48 -05:00
Jose Carlos Venegas Munoz
28925a085c scripts: qemu config: add prefix ENV variable.
We were using an static prefix let allow the user choose where will be installed.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-15 16:53:48 -05:00
Jose Carlos Venegas Munoz
3ca4f91a4c kernel: build: fail on missing config version file.
If the file is not found fail. We use this file
to identify what config we use to build the kernel.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-15 16:53:48 -05:00
Jose Carlos Venegas Munoz
6c81bda73a obs: qemu-vanilla: point to qemu commit.
OBS fails to resolve a tag so lets provide the commit
we want to build.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-15 16:53:48 -05:00
Jose Carlos Venegas Munoz
2bbdefaa90 obs: fix installation path for proxy and shim.
Installation path was not the expected in SUSE.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-15 16:53:48 -05:00
Jose Carlos Venegas Munoz
438b89c9bc obs: versions: generate versions.txt
Now we can auto-generate versions.txt

lets update versions to master.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-15 16:53:48 -05:00
Jose Carlos Venegas Munoz
319531788f obs: version: add gen_versions_txt script.
Based ina a branch will query the current
kata version and needed hashes.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-15 16:53:48 -05:00
Jose Carlos Venegas Munoz
20a1928705 obs: docker-build: Pass OBSPROJECT variable
Pass project variable to docker run.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-15 16:53:48 -05:00
Jose Carlos Venegas Munoz
5e0dc9efba obs: update version to 1.2.0
Update hashes and versions for new Kata version.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-15 16:53:48 -05:00
Jose Carlos Venegas Munoz
527bd92e2b obs: image: remove unused variables.
Remove unsed variables.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-15 16:53:48 -05:00
Jose Carlos Venegas Munoz
5362e22df0 versions: upadate qemu commit.
update qemu commit
Remove unsed variables.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-15 16:53:48 -05:00
Jose Carlos Venegas Munoz
4cce1653a7 obs: lib: remove unused flag APIURL
Today we dont change the APIURL remove it by now.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-15 16:53:48 -05:00
Jose Carlos Venegas Munoz
59e3ffcbfa obs: runtime: fix function call pkg_version.
pkg_version require 3 parameters.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-15 16:53:48 -05:00
Jose Carlos Venegas Munoz
19ed81d0d0 obs: qemu set hash variable.
Needed by changelog function.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-15 16:53:48 -05:00
Jose Carlos Venegas Munoz
e9ed406d0a obs: kernel: set unbound variable.
Set variable to make happy lib functions

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-15 16:53:48 -05:00
Jose Carlos Venegas Munoz
b06f33bd66 obs: lib: Fix reference to not defined variable.
API variable can be empty.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-15 16:53:48 -05:00
Jose Carlos Venegas Munoz
7ccf64ee09 obs: pkglib: remove unused option.
Remove unused option.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-15 16:53:48 -05:00
Jose Carlos Venegas Munoz
0c7b2a82c3 obs: image: Fix to use new image tarball name.
The image name changed fix to allow obs build.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-15 16:53:48 -05:00
Jose Carlos Venegas Munoz
bb889a464d obs: build-from-docker.sh: Not build image if already craeted.
Accelerate the build process by not creating image again.

Add DEBUG flag to docker run.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-15 16:53:48 -05:00
Jose Carlos Venegas Munoz
9c64f571f6 obs: build_all.sh: serach scripts in own dir.
update scripts are relative to this script go to
it and then try to update.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-15 16:53:48 -05:00
Jose Carlos Venegas Munoz
b8a41a8994 gitignore: Ignore tarballs and generated files.
Ignore tarballs and sha files

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-15 16:53:48 -05:00
Jose Carlos Venegas Munoz
0628e4de7f release: add kata-deploy-binaries.sh
Add script to generate a tarball with kata binaries install kata
whitout pkgs.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-15 16:53:48 -05:00
Eric Ernst
ea91fff56b kata-deploy: pull particular version of deploy image
For 1.2.0 we are changing the format of the kata-deploy container image.
To avoid issues, pull an explicit version in our daemonset.

In a follow on PR we'll update the yaml/scripts to 1.2.0 format

Fixes: #135

Signed-off-by: Eric Ernst <eric.ernst@intel.com>
2018-08-14 15:49:16 -07:00
Jose Carlos Venegas Munoz
79da855b83 build-image: Dont create image in script dir.
Create in the current directory where the script is called.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-14 14:08:42 -05:00
Jose Carlos Venegas Munoz
91c7213148 relase: add script publish-kata-image.sh
Add script to publish kata image in agent repository.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-14 14:07:45 -05:00
Jose Carlos Venegas Munoz
639df2276b build-image: Pass DEBUG to osbuilder.
Pass debug flag when we use docker.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-14 14:00:36 -05:00
Jose Carlos Venegas Munoz
8c223e811c lib: get deps based in a branch.
We want to create pacakges based in different branches modify
function to get the yaml version needed to to that.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-14 14:00:36 -05:00
Jose Carlos Venegas Munoz
764ce02779 obs: build_all.sh: Add usage function (refactor)
Add usage function.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-14 14:00:36 -05:00
Jose Carlos Venegas Munoz
0d789968a4 obs: build_from_docker: Add arg to build based in a branch.
Build OBS packages based in a kata brach.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-14 14:00:36 -05:00
Jose Carlos Venegas Munoz
f7074e178a obs: : Minor bash fixes (refactor)
Remove unused variables and set default value to variables.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-14 14:00:36 -05:00
Jose Carlos Venegas Munoz
6c5c293f81 obs: scripts: Set bash options (refactor)
Add long name bash options.

Make xtrace optional when DEBUG variable is set.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-14 14:00:36 -05:00
Jose Carlos Venegas Munoz
1659d4ace7 obs: pkglib: get_obs_pkg_release: Allow find release number in empty repo.
If we can not find a release number in a file this means
it is an new repository. This could happend when upload changes
for a new brach.

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