Преглед на файлове

[Stress] Copy stresstests to test independent of version

Ask Solem преди 9 години
родител
ревизия
5e40cfbd77
променени са 2 файла, в които са добавени 10 реда и са изтрити 10 реда
  1. 1 1
      funtests/stress/run/provision/celeryd-init.config
  2. 9 9
      funtests/stress/run/provision/provision.sh

+ 1 - 1
funtests/stress/run/provision/celeryd-init.config

@@ -1,7 +1,7 @@
 CELERYD_NODES="worker1"
 CELERY_BIN="/usr/local/bin/celery"
 CELERY_APP="stress"
-CELERYD_CHDIR="/opt/devel/celery/funtests/stress"
+CELERYD_CHDIR="/opt/devel/stress"
 CELERYD_OPTS="-c10 --maxtasksperchild=256 -Z vagrant1"
 CELERYD_LOG_FILE="/var/log/celery/%n%I.log"
 CELERYD_PID_FILE="/var/run/celery/%n.pid"

+ 9 - 9
funtests/stress/run/provision/provision.sh

@@ -29,6 +29,7 @@ CELERY_DIR="${GIT_ROOT}/celery"
 CELERY_FUNTESTS="${CELERY_DIR}/funtests/stress"
 CELERY_CONFIG_SRC="${CELERY_FUNTESTS}/run/provision/celeryd-init.config"
 CELERY_CONFIG_DST="/etc/default/celeryd"
+STRESS_DIR="${GIT_ROOT}/stress"
 
 
 die () {
@@ -48,12 +49,6 @@ add_real_user () {
     id "$1" || die "Not able to create user"
 }
 
-for_user_makedir () {
-    mkdir "$2"
-    chown "$1" "$2"
-    chmod 0755 "$2"
-}
-
 # --- system
 
 make_directories () {
@@ -134,12 +129,11 @@ install_git () {
 
 
 github_clone () {
-    (cd "${GIT_ROOT}"; git clone "${GITHUB_ROOT}/${1}/${2}")
+    mkdir "${CELERY_DIR}"
     chown "${CELERY_USER}" "${CELERY_DIR}"
-    ls -l /opt/devel/celery
+    (cd "${GIT_ROOT}"; sudo -u celery git clone "${GITHUB_ROOT}/${1}/${2}")
 }
 
-
 # --- pip
 
 pip_install () {
@@ -181,6 +175,11 @@ install_celery () {
     install_celery_service
 }
 
+install_stress () {
+    mkdir "${STRESS_DIR}"
+    chown "${CELERY_USER}" "${STRESS_DIR}"
+    cp -r "${CELERY_DIR}/funtests/stress/*" "${STRESS_DIR}"
+}
 
 # --- MAIN
 
@@ -193,6 +192,7 @@ provision () {
     install_redis
     install_pip
     install_celery
+    install_stress
 }
 
 provision