Skip to content
This repository was archived by the owner on Mar 28, 2018. It is now read-only.

Fix OBS variables #948

Merged
merged 2 commits into from
Jun 6, 2017
+10 −4
Merged

Fix OBS variables #948

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9bb4dd
build: Fix OBS variables in package helper scripts
gorozco1 Jun 5, 2017
9d0bbb1
OBS: Update changelog used in OBS to package the runtime
gorozco1 Jun 5, 2017
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
6 changes: 6 additions & 0 deletions data/obs-packaging/cc-oci-runtime/debian.changelog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
cc-oci-runtime (2.1.10) stable; urgency=medium

* Update cc-oci-runtime 2.1.10 edebf40

-- Geronimo Orozco <[email protected]> Mon, 05 Jun 2017 10:52:21 -0500

cc-oci-runtime (2.1.9) stable; urgency=medium

* Update cc-oci-runtime 2.1.9 2b6b95b
6 changes: 3 additions & 3 deletions data/obs-packaging/clear-containers-image/update_image.sh
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ source "$CC_VERSIONS_FILE"
VERSION=${1:-$clear_vm_image_version}

OBS_PUSH=${OBS_PUSH:-false}
OBS_CC_IMAGE_REPO=${OBS_RUNTIME_REPO:-home:clearlinux:preview:clear-containers-staging/clear-containers-image}
OBS_CC_IMAGE_REPO=${OBS_CC_IMAGE_REPO:-home:clearlinux:preview:clear-containers-staging/clear-containers-image}

git checkout wd/debian/changelog
last_release=`cat wd/debian/changelog | head -1 | awk '{print $2}' | cut -d'-' -f2 | tr -d ')'`
@@ -54,8 +54,8 @@ then
TMPDIR=$(mktemp -d -t ${temp}.XXXXXXXXXXX) || exit 1
cd ..
cc_image_dir=$(pwd)
rm clear-containers-image_$VERSION-${next_release}_source.build \
clear-containers-image_$VERSION-${next_release}_source.changes
rm clear-containers-image_*_source.build \
clear-containers-image_*_source.changes
osc co "$OBS_CC_IMAGE_REPO" -o $TMPDIR
cd $TMPDIR
osc rm clear-*-containers.img.xz
2 changes: 1 addition & 1 deletion data/obs-packaging/linux-container/update_kernel.sh
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ clear_vm_kernel_version=$(echo $clear_vm_kernel_version | cut -d'-' -f1)
VERSION=${1:-$clear_vm_kernel_version}

OBS_PUSH=${OBS_PUSH:-false}
OBS_CC_KERNEL_REPO=${OBS_RUNTIME_REPO:-home:clearlinux:preview:clear-containers-staging/linux-container}
OBS_CC_KERNEL_REPO=${OBS_CC_KERNEL_REPO:-home:clearlinux:preview:clear-containers-staging/linux-container}

git checkout wd/debian/changelog
last_release=`cat wd/debian/changelog | head -1 | awk '{print $2}' | cut -d'-' -f2 | tr -d ')'`