Compare commits
No commits in common. "514a1bd75cba7efc56828d87387e23cfc9a7c1e3" and "f2e332f35bd9f407445c9ba692fafe350612fc1b" have entirely different histories.
514a1bd75c
...
f2e332f35b
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,6 +3,7 @@
|
|||||||
__pycache__/
|
__pycache__/
|
||||||
*.py[cod]
|
*.py[cod]
|
||||||
*$py.class
|
*$py.class
|
||||||
|
__init__.py
|
||||||
|
|
||||||
# C extensions
|
# C extensions
|
||||||
*.so
|
*.so
|
||||||
|
|||||||
21
expenses_manager/Jenkinsfile
vendored
21
expenses_manager/Jenkinsfile
vendored
@ -73,7 +73,7 @@ pipeline {
|
|||||||
// pytest died before collecting anything produces no XML,
|
// pytest died before collecting anything produces no XML,
|
||||||
// and that must fail rather than pass quietly.
|
// and that must fail rather than pass quietly.
|
||||||
junit allowEmptyResults: false,
|
junit allowEmptyResults: false,
|
||||||
testResults: 'expenses_manager/junit.xml'
|
testResults: 'expenses_manager/junit.xml'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -92,7 +92,7 @@ pipeline {
|
|||||||
"rm -rf ${CI_DIR} && mkdir -p ${CI_DIR}"
|
"rm -rf ${CI_DIR} && mkdir -p ${CI_DIR}"
|
||||||
|
|
||||||
tar -czf - --exclude=./expenses_manager/venv \
|
tar -czf - --exclude=./expenses_manager/venv \
|
||||||
--exclude=./.git . \
|
--exclude=./.git . \
|
||||||
| ssh ${SSH_OPTS} ${NAS_USER}@${NAS_HOST} \
|
| ssh ${SSH_OPTS} ${NAS_USER}@${NAS_HOST} \
|
||||||
"tar -xzf - -C ${CI_DIR}"
|
"tar -xzf - -C ${CI_DIR}"
|
||||||
|
|
||||||
@ -119,23 +119,6 @@ pipeline {
|
|||||||
-e DB_ENGINE=sqlite3 \
|
-e DB_ENGINE=sqlite3 \
|
||||||
${IMAGE}:${SHA} python manage.py check"
|
${IMAGE}:${SHA} python manage.py check"
|
||||||
'''
|
'''
|
||||||
|
|
||||||
// A migrations directory without __init__.py is a namespace
|
|
||||||
// package, and Django deliberately ignores those: the app then
|
|
||||||
// appears to have no migrations at all, migrate --check always
|
|
||||||
// reports nothing pending, and a real migration would silently
|
|
||||||
// never be applied. This is what .gitignore line 6 caused.
|
|
||||||
sh '''
|
|
||||||
SHA=$(echo "${GIT_COMMIT}" | cut -c1-7)
|
|
||||||
ssh ${SSH_OPTS} ${NAS_USER}@${NAS_HOST} \
|
|
||||||
"sudo ${NAS_DOCKER} run --rm \
|
|
||||||
-e SECRET_KEY=smoke-test-only \
|
|
||||||
-e DEBUG=False \
|
|
||||||
-e ALLOWED_HOSTS=localhost \
|
|
||||||
-e DB_ENGINE=sqlite3 \
|
|
||||||
${IMAGE}:${SHA} python manage.py showmigrations expenses" \
|
|
||||||
| grep -q '0001_initial'
|
|
||||||
'''
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user