Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
synergy
o3skim
Commits
4862a09d
Commit
4862a09d
authored
Aug 18, 2020
by
BorjaEst
Browse files
Merge branch '1-rename-project-from-template'
parents
bfef2bbc
6508114a
Changes
7
Show whitespace changes
Inline
Side-by-side
Dockerfile
View file @
4862a09d
...
...
@@ -41,7 +41,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
ENV
DEBIAN_FRONTEND=dialog
# Install user app:
RUN
git clone
--depth
1
-b
${
branch
}
https://git
hub.com/BorjaEst/cicd
.git app
&&
\
RUN
git clone
--depth
1
-b
${
branch
}
https://git
.scc.kit.edu/synergy.o3as/o3skim
.git app
&&
\
# Install python application
cd app && \
pip3 install --no-cache-dir -e . && \
...
...
Jenkinsfile
View file @
4862a09d
pipeline
{
environment
{
registry
=
"boressan/
cicd
"
registry
=
"boressan/
o3skim
"
registryCredential
=
'dockerhub_id'
}
agent
any
...
...
@@ -20,7 +20,7 @@ pipeline {
stage
(
'Docker-hub upload'
)
{
steps
{
echo
'====================uploading docker-hub=============================='
script
{
docker
.
withRegistry
(
''
,
registryCredential
)
{
customImage
.
push
(
'python'
)
}
}
script
{
docker
.
withRegistry
(
''
,
registryCredential
)
{
customImage
.
push
()
}
}
}
}
}
...
...
main
View file @
4862a09d
...
...
@@ -5,7 +5,7 @@ Main function description - To show in command help
import
sys
import
argparse
from
cicd
import
module_template
from
o3skim
import
module_template
def
cmdline_args
():
...
...
cicd
/__init__.py
→
o3skim
/__init__.py
View file @
4862a09d
File moved
cicd
/module_template.py
→
o3skim
/module_template.py
View file @
4862a09d
File moved
setup.cfg
View file @
4862a09d
[metadata]
name =
cicd
name =
o3skim
version = 0.1.0
description = My package description
description-file = README.md
...
...
@@ -16,5 +16,5 @@ scripts =
[options.entry_points]
console_scripts =
hello_world =
cicd
.module_template:hello_world
hello_world =
o3skim
.module_template:hello_world
tests/test_template.py
View file @
4862a09d
...
...
@@ -3,10 +3,10 @@
import
unittest
from
cicd
import
module_template
from
o3skim
import
module_template
class
Test
CICD
_module_template
(
unittest
.
TestCase
):
class
Test
O3SKIM
_module_template
(
unittest
.
TestCase
):
"""Tests for `module_template` package."""
def
setUp
(
self
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment