Commit 4862a09d authored by BorjaEst's avatar BorjaEst
Browse files

Merge branch '1-rename-project-from-template'

parents bfef2bbc 6508114a
...@@ -41,7 +41,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ ...@@ -41,7 +41,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
ENV DEBIAN_FRONTEND=dialog ENV DEBIAN_FRONTEND=dialog
# Install user app: # Install user app:
RUN git clone --depth 1 -b ${branch} https://github.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 # Install python application
cd app && \ cd app && \
pip3 install --no-cache-dir -e . && \ pip3 install --no-cache-dir -e . && \
......
pipeline { pipeline {
environment { environment {
registry = "boressan/cicd" registry = "boressan/o3skim"
registryCredential = 'dockerhub_id' registryCredential = 'dockerhub_id'
} }
agent any agent any
...@@ -20,7 +20,7 @@ pipeline { ...@@ -20,7 +20,7 @@ pipeline {
stage('Docker-hub upload') { stage('Docker-hub upload') {
steps { steps {
echo '====================uploading docker-hub==============================' echo '====================uploading docker-hub=============================='
script { docker.withRegistry('', registryCredential) { customImage.push('python') } } script { docker.withRegistry('', registryCredential) { customImage.push() } }
} }
} }
} }
......
...@@ -5,7 +5,7 @@ Main function description - To show in command help ...@@ -5,7 +5,7 @@ Main function description - To show in command help
import sys import sys
import argparse import argparse
from cicd import module_template from o3skim import module_template
def cmdline_args(): def cmdline_args():
......
[metadata] [metadata]
name = cicd name = o3skim
version = 0.1.0 version = 0.1.0
description = My package description description = My package description
description-file = README.md description-file = README.md
...@@ -16,5 +16,5 @@ scripts = ...@@ -16,5 +16,5 @@ scripts =
[options.entry_points] [options.entry_points]
console_scripts = console_scripts =
hello_world = cicd.module_template:hello_world hello_world = o3skim.module_template:hello_world
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
import unittest import unittest
from cicd import module_template from o3skim import module_template
class TestCICD_module_template(unittest.TestCase): class TestO3SKIM_module_template(unittest.TestCase):
"""Tests for `module_template` package.""" """Tests for `module_template` package."""
def setUp(self): def setUp(self):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment