Merge pull request #197 from bergwolf/fix-release

release: fix release scripts issues found in 1.3.0 and bump package versions

obs-packaging/build_from_docker.sh

@@ -26,9 +26,6 @@ source "${script_dir}/scripts/obs-docker.sh"
 GO_ARCH=$(go env GOARCH)
 export GO_ARCH
 
-OSCRC="${HOME}/.oscrc"
-OBS_API="https://api.opensuse.org"
-
 usage() {
 	msg="${1:-}"
 	exit_code=$"${2:-0}"
@@ -52,21 +49,6 @@ main() {
 	popd >>/dev/null
 	#Build all kata packages
 	make -f "${script_dir}/Makefile" clean
-	if [ -n "${OBS_USER:-}" ] && [ -n "${OBS_PASS:-}" ] && [ ! -e "${OSCRC}" ]; then
-		echo "Creating  ${OSCRC} with user $OBS_USER"
-		cat <<eom >"${OSCRC}"
-[general]
-apiurl = ${OBS_API}
-[${OBS_API}]
-user = ${OBS_USER}
-pass = ${OBS_PASS}
-eom
-	fi
-
-	if [ ! -e "${OSCRC}" ]; then
-		echo "${OSCRC}, please  do 'export OBS_USER=your_user ; export OBS_PASS=your_pass' to configure osc for first time."
-		exit 1
-	fi
 	docker_run "${packaging_repo_dir}/obs-packaging/build_all.sh ${branch}"
 }
 

obs-packaging/linux-container/debian.dirs

@@ -1,2 +1 @@
 usr/share/Kata-containers
-

obs-packaging/linux-container/kata-linux-container.spec-template

@@ -79,7 +79,7 @@ BuildKernel() {
 
     %if 0%{?fedora}
     #Fedora uses gcc 8, build is failing due to warnings.
-    export CFLAGS="-Wno-error=restrict"	 
+    export CFLAGS="-Wno-error=restrict"
     export EXTRA_CFLAGS="-Wno-format-truncation -Wno-cast-function-type -Wno-error=restrict -Wno-error"
     %endif
 

obs-packaging/runtime/kata-runtime.spec-template

@@ -8,11 +8,7 @@
 
 %global DEFAULT_QEMU qemu-lite-system-x86_64
 
-%if 0%{?suse_version}
-%define LIBEXECDIR %{_libdir}
-%else
-%define LIBEXECDIR %{_libexecdir}
-%endif
+%define LIBEXECDIR /usr/libexec
 
 %undefine _missing_build_ids_terminate_build
 %define  debug_package %{nil}
@@ -98,6 +94,9 @@ sed -i -e '/^initrd =/d' %{buildroot}/usr/share/defaults/kata-containers/configu
 %files
 %defattr(-,root,root,-)
 /usr/bin/kata-runtime
+%{LIBEXECDIR}
+%{LIBEXECDIR}/kata-containers
+%{LIBEXECDIR}/kata-containers/kata-netmon
 /usr/bin/kata-collect-data.sh
 /usr/share/defaults/
 /usr/share/defaults/kata-containers/

obs-packaging/scripts/obs-docker.sh

@@ -7,12 +7,38 @@
 _obs_docker_packaging_repo_dir=$(cd $(dirname "${BASH_SOURCE[0]}") && cd ../.. && pwd)
 GO_ARCH=$(go env GOARCH)
 
+setup_oscrc() {
+	# oscrc exists at different places on different distros
+	[ -f "${HOME}/.config/osc/oscrc" ] && OSCRC="${HOME}/.config/osc/oscrc"
+	OSCRC=${OSCRC:-"${HOME}/.oscrc"}
+	OBS_API="https://api.opensuse.org"
+
+	if [ -n "${OBS_USER:-}" ] && [ -n "${OBS_PASS:-}" ] && [ ! -e "${OSCRC}" ]; then
+		echo "Creating  ${OSCRC} with user $OBS_USER"
+		mkdir -p $(dirname $OSCRC)
+		cat <<eom >"${OSCRC}"
+[general]
+apiurl = ${OBS_API}
+[${OBS_API}]
+user = ${OBS_USER}
+pass = ${OBS_PASS}
+eom
+	fi
+
+	if [ ! -e "${OSCRC}" ]; then
+		echo "${OSCRC}, please  do 'export OBS_USER=your_user ; export OBS_PASS=your_pass' to configure osc for first time."
+		exit 1
+	fi
+}
+
 docker_run() {
 	local cmd="$*"
 	local obs_image="obs-kata"
 	#where results will be stored
 	local host_datadir="${PWD}/pkgs"
 	local cache_dir=${PWD}/obs-cache
+	setup_oscrc
+
 	sudo docker build \
 		--quiet \
 		--build-arg http_proxy="${http_proxy:-}" \
@@ -32,7 +58,7 @@ docker_run() {
 		-v "${cache_dir}":/var/tmp/osbuild-packagecache/ \
 		-v "${_obs_docker_packaging_repo_dir}":"${_obs_docker_packaging_repo_dir}" \
 		-v "${host_datadir}":/var/packaging \
-		-v "${HOME}/.oscrc":/root/.oscrc \
+		-v "${OSCRC}":/root/.oscrc \
 		-v "${PWD}":"${PWD}" \
 		-w "${PWD}" \
 		-ti "${obs_image}" bash -c "${cmd}"

obs-packaging/scripts/obs-pkgs.sh

@@ -9,7 +9,7 @@
 OBS_PKGS_PROJECTS=(
 	qemu-lite
 	qemu-vanilla
-	kernel
+	linux-container
 	kata-containers-image
 	proxy
 	shim

obs-packaging/versions.txt

@@ -1,23 +1,23 @@
 
 # This is a generated file from gen_versions_txt.sh
 
-kata_runtime_version=1.3.0~rc1
-kata_runtime_hash=22aedc4fb6b9a78a59f59df06f1b8d48021b952e
+kata_runtime_version=1.3.0
+kata_runtime_hash=a786643d0b3c0195deeb6ef5d4c2a161009a80aa
 
-kata_proxy_version=1.3.0~rc1
-kata_proxy_hash=981fef4774ba15cf94a3a9013629d0ab60668348
+kata_proxy_version=1.3.0
+kata_proxy_hash=6ddb006ad3f709cab018af9dc0bf9e756c3ce2cd
 
-kata_shim_version=1.3.0~rc1
-kata_shim_hash=9b2891cfb153967fa4a65e44b2928255c889f643
+kata_shim_version=1.3.0
+kata_shim_hash=5fbf1f0919ce0bb1f2b7e85692cdf3058023926f
 
-kata_agent_version=1.3.0~rc1
-kata_agent_hash=1ee972176ae437bcace0a37227818c506bb64ba9
+kata_agent_version=1.3.0
+kata_agent_hash=042c3ebd71c2ca425aa0c70fadcbf6370116659b
 
-kata_ksm_throttler_version=1.3.0~rc1
-kata_ksm_throttler_hash=48a9568e0e9e134c4409f767a870b422ad31ff16
+kata_ksm_throttler_version=1.3.0
+kata_ksm_throttler_hash=6e903fb19378a1a6132f8d3a43b65ee9c1643673
 
 # Dependencies
-kata_osbuilder_version=1.3.0~rc1
+kata_osbuilder_version=1.3.0
 
 qemu_lite_version=2.11.0
 qemu_lite_hash=f88622805677163b04498dcba35ceca0183b1318

release/kata-deploy-binaries.sh

@@ -128,12 +128,16 @@ install_kata_components() {
 		libexecdir="libexec"
 		if [ "$p" == "shim" ]; then
 			libexecdir="/${destdir}/${prefix}/libexec/"
+			make PREFIX="${prefix}" \
+				DESTDIR="${destdir}" \
+				LIBEXECDIR="${libexecdir}" \
+				install
+		else
+			echo "Install"
+			make PREFIX="${prefix}" \
+				DESTDIR="${destdir}" \
+				install
 		fi
-		echo "Install"
-		make PREFIX="${prefix}" \
-			DESTDIR="${destdir}" \
-			LIBEXECDIR="${libexecdir}" \
-			install
 		popd >>/dev/null
 	done
 	sed -i -e '/^initrd =/d' "${destdir}/${prefix}/share/defaults/${project}/configuration.toml"

release/tag_repos.sh

@@ -144,10 +144,14 @@ create_github_release() {
 	repo_dir=${1:-}
 	tag=${2:-}
 	[ -d "${repo_dir}" ] || die "No repository directory"
-	[ -n "${tag}" ] || die "No repository directory"
-	if ! "${hub_bin}" release | grep "${tag}"; then
+	[ -n "${tag}" ] || die "No tag specified"
+	if ! "${hub_bin}" release | grep -q "^${tag}$"; then
 		info "Creating Github release"
-		"${hub_bin}" -C "${repo_dir}" release create -m "${PROJECT} ${tag}" "${tag}"
+		if [[ "$tag" =~ "-rc" ]]; then
+			rc_args="-p"
+		fi
+		rc_args=${rc_args:-}
+		"${hub_bin}" -C "${repo_dir}" release create ${rc_args} -m "${PROJECT} ${tag}" "${tag}"
 	else
 		info "Github release already created"
 	fi

static-build/qemu/Dockerfile

@@ -42,7 +42,6 @@ ADD configure-hypervisor.sh /root/configure-hypervisor.sh
 RUN PREFIX=/opt/kata /root/configure-hypervisor.sh -s kata-qemu | xargs ./configure \
        --with-pkgversion=kata-static
 
-RUN make clean
 RUN make -j$(nproc)
 RUN make install DESTDIR=/tmp/qemu-static
 RUN cd /tmp/qemu-static && tar -czvf kata-qemu-static.tar.gz *