mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-12-08 02:41:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate for_test upstart jobs by building and installing test/dev init pkgs.

Browse Source 
We also remove some dead mod_for_test scripts.

BUG=chromium-os:9729, chromium-os:14091
TEST=build_packages, build_image dev test
CQ-DEPEND=If58678ab4fe7abd9142a619850be07249d159781

Change-Id: Iff6a143dbf8ce58878dc1b07629c52bbb7f02ded
Reviewed-on: https://gerrit.chromium.org/gerrit/32998
Reviewed-by: Chris Sosa <sosa@chromium.org>
Tested-by: Chris Sosa <sosa@chromium.org>
Commit-Ready: Chris Sosa <sosa@chromium.org>
This commit is contained in:
Chris Sosa 2012-09-11 15:04:41 -07:00 committed by Gerrit
parent 70c8db6806
commit 0538571ce1
5 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build_library/dev_image_util.sh
View File

@ -22,6 +22,9 @@ install_dev_packages() {
# Determine the root dir for developer packages. # Determine the root dir for developer packages.
local root_dev_dir="${ROOT_FS_DIR}/usr/local" local root_dev_dir="${ROOT_FS_DIR}/usr/local"
# Install dev-specific init scripts into / from chromeos-dev-init.
emerge_to_image --root="${ROOT_FS_DIR}" chromeos-dev-init
# Install developer packages described in chromeos-dev. # Install developer packages described in chromeos-dev.
emerge_to_image --root="${root_dev_dir}" chromeos-dev emerge_to_image --root="${root_dev_dir}" chromeos-dev

1
build_library/test_image_util.sh
View File

@ -77,6 +77,7 @@ emerge_chromeos_test() {
# Determine the root dir for test packages. # Determine the root dir for test packages.
local root_dev_dir="${ROOT_FS_DIR}/usr/local" local root_dev_dir="${ROOT_FS_DIR}/usr/local"
emerge_to_image --root="${ROOT_FS_DIR}" chromeos-test-init
emerge_to_image --root="${root_dev_dir}" chromeos-test emerge_to_image --root="${root_dev_dir}" chromeos-test
} }

2
build_packages
View File

@ -155,6 +155,7 @@ if [[ $# -eq 0 ]]; then
PACKAGES=( chromeos-base/chromeos ) PACKAGES=( chromeos-base/chromeos )
if [[ "${FLAGS_withdev}" -eq "${FLAGS_TRUE}" ]]; then if [[ "${FLAGS_withdev}" -eq "${FLAGS_TRUE}" ]]; then
PACKAGES+=( chromeos-base/chromeos-dev ) PACKAGES+=( chromeos-base/chromeos-dev )
PACKAGES+=( chromeos-base/chromeos-dev-init )
fi fi
if [[ "${FLAGS_withfactory}" -eq "${FLAGS_TRUE}" ]]; then if [[ "${FLAGS_withfactory}" -eq "${FLAGS_TRUE}" ]]; then
PACKAGES+=( chromeos-base/chromeos-factory ) PACKAGES+=( chromeos-base/chromeos-factory )
@ -164,6 +165,7 @@ if [[ $# -eq 0 ]]; then
fi fi
if [[ "${FLAGS_withtest}" -eq "${FLAGS_TRUE}" ]]; then if [[ "${FLAGS_withtest}" -eq "${FLAGS_TRUE}" ]]; then
PACKAGES+=( chromeos-base/chromeos-test ) PACKAGES+=( chromeos-base/chromeos-test )
PACKAGES+=( chromeos-base/chromeos-test-init )
fi fi
if [[ "${FLAGS_withautotest}" -eq "${FLAGS_TRUE}" ]]; then if [[ "${FLAGS_withautotest}" -eq "${FLAGS_TRUE}" ]]; then
PACKAGES+=( chromeos-base/autotest-all ) PACKAGES+=( chromeos-base/autotest-all )

11
mod_for_test_scripts/400modifyUpstart
View File

@ -1,11 +0,0 @@
#!/bin/bash
# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
echo "Modifying upstart scripts for test accessibility."
for script in "${ROOT_FS_DIR}/etc/init/*.conf"; do
sed -i 's/#for_test //' ${script}
done

9
mod_for_test_scripts/900mountHomeExec
View File

@ -1,9 +0,0 @@
#!/bin/bash
# Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
# Create a marker file indicating that we are in mod_for_test
echo "Setting /home to be mounted exec"
sed -i -e 's/#mod_for_test#//g' ${ROOT_FS_DIR}/sbin/chromeos_startup