From 0d5223db231e3d4e5abc7d20c29f1f0269ccff3f Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren@rancher.com>
Date: Sun, 22 May 2016 23:51:46 -0700
Subject: [PATCH] Fix tests

---
 Dockerfile.dapper                           | 1 +
 os-config.tpl.yml                           | 2 +-
 scripts/release                             | 3 +++
 tests/integration/rostest/test_00_system.py | 4 +---
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Dockerfile.dapper b/Dockerfile.dapper
index 0b75f87b..a35ba539 100644
--- a/Dockerfile.dapper
+++ b/Dockerfile.dapper
@@ -78,6 +78,7 @@ ENV KERNEL_URL KERNEL_URL_${ARCH}
 ENV OS_BASE_URL OS_BASE_URL_${ARCH}
 ENV OS_BASE_SHA1 OS_BASE_SHA1_${ARCH}
 ENV VBOX_MODULES_URL VBOX_MODULES_URL_${ARCH}
+ENV REPO_VERSION master
 
 # Export all ARGS as ENV
 ENV ARCH=${ARCH} DAPPER_HOST_ARCH=${DAPPER_HOST_ARCH} HOST_ARCH=${HOST_ARCH} OS_REPO=${OS_REPO} HOSTNAME_DEFAULT=${HOSTNAME_DEFAULT} DISTRIB_ID=${DISTRIB_ID} DOCKER_VERSION=${DOCKER_VERSION} DOCKER_PATCH_VERSION=${DOCKER_PATCH_VERSION} SELINUX_POLICY_URL=${SELINUX_POLICY_URL} KERNEL_URL_amd64=${KERNEL_URL_amd64} KERNEL_URL_arm64=${KERNEL_URL_arm64} DOCKER_URL_amd64=${DOCKER_URL_amd64} DOCKER_URL_arm=${DOCKER_URL_arm} DOCKER_URL_arm64=${DOCKER_URL_arm64} TOOLCHAIN_arm64=${TOOLCHAIN_arm64} TOOLCHAIN_arm=${TOOLCHAIN_arm} OS_RELEASES_YML=${OS_RELEASES_YML} VBOX_MODULES_URL=${VBOX_MODULES_URL} VBOX_MODULES_URL_amd64=${VBOX_MODULES_URL_amd64} OS_SERVICES_REPO=${OS_SERVICES_REPO} IMAGE_NAME=${IMAGE_NAME} DFS_IMAGE=${DFS_IMAGE} OS_BASE_URL=${OS_BASE_URL} OS_BASE_SHA1=${OS_BASE_SHA1} OS_BASE_URL_amd64=${OS_BASE_URL_amd64} OS_BASE_URL_arm=${OS_BASE_URL_arm} OS_BASE_URL_arm64=${OS_BASE_URL_arm64}
diff --git a/os-config.tpl.yml b/os-config.tpl.yml
index f694b29c..188faee2 100644
--- a/os-config.tpl.yml
+++ b/os-config.tpl.yml
@@ -66,7 +66,7 @@ rancher:
       nameservers: [8.8.8.8, 8.8.4.4]
   repositories:
     core:
-      url: {{.OS_SERVICES_REPO}}/{{.VERSION}}{{.SUFFIX}}
+      url: {{.OS_SERVICES_REPO}}/{{.REPO_VERSION}}{{.SUFFIX}}
   state:
     fstype: auto
     dev: LABEL=RANCHER_STATE
diff --git a/scripts/release b/scripts/release
index 7af0df35..80a80a63 100755
--- a/scripts/release
+++ b/scripts/release
@@ -1,3 +1,6 @@
 #!/bin/bash
 
+source $(dirname $0)/version
+export REPO_VERSION=$VERSION
+
 exec $(dirname $0)/ci
diff --git a/tests/integration/rostest/test_00_system.py b/tests/integration/rostest/test_00_system.py
index 23cefb1f..ee0a5194 100644
--- a/tests/integration/rostest/test_00_system.py
+++ b/tests/integration/rostest/test_00_system.py
@@ -13,9 +13,7 @@ def qemu(request):
 
 @pytest.mark.timeout(30)
 def test_system_boot(qemu):
-    version = u.rancheros_version('./build.conf')
-    print('parsed version: ' + version)
-    u.flush_out(qemu.stdout, 'RancherOS {v} started'.format(v=version))
+    u.flush_out(qemu.stdout)
 
 
 busybox = {'amd64': 'busybox', 'arm': 'armhf/busybox', 'arm64': 'aarch64/busybox'}