From: Chen, Jackie Date: Thu, 21 May 2020 16:53:27 +0000 (-0400) Subject: moved dockerfiles to docker dir and updated jenkins file to reflect that X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?p=it%2Fotf.git;a=commitdiff_plain;h=b4313736f2b146b57f73f2af882529a19a2efdd1 moved dockerfiles to docker dir and updated jenkins file to reflect that renamed o1-vth directory to smo-o1-vth Change-Id: Ie251aae3777d00940e8f64f4ceb977aaa014364b Signed-off-by: Chen, Jackie --- diff --git a/a1-mediator-vth/Jenkinsfile b/a1-mediator-vth/Jenkinsfile index a58148c..7b20420 100644 --- a/a1-mediator-vth/Jenkinsfile +++ b/a1-mediator-vth/Jenkinsfile @@ -64,7 +64,7 @@ node("docker"){ stage 'Publish Artifact' withCredentials([usernamePassword(credentialsId: MECHID, usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) { - dir("smo-vth") { + dir("docker") { echo "Artifact: " + IMAGE_NAME sh """ diff --git a/a1-mediator-vth/Dockerfile b/a1-mediator-vth/docker/Dockerfile similarity index 76% rename from a1-mediator-vth/Dockerfile rename to a1-mediator-vth/docker/Dockerfile index e708483..dca0186 100644 --- a/a1-mediator-vth/Dockerfile +++ b/a1-mediator-vth/docker/Dockerfile @@ -1,13 +1,13 @@ -FROM python:3.7.4 - -RUN python --version - -ADD pip-requirements.txt pip-requirements.txt -ADD a1-mediator-vth.py a1-mediator-vth.py -ADD config.json config.json - -RUN mkdir -p /otf/logs - -RUN python -m pip install --proxy -r pip-requirements.txt - -ENTRYPOINT ["python", "a1-mediator-vth.py"] +FROM python:3.7.4 + +RUN python --version + +ADD pip-requirements.txt pip-requirements.txt +ADD a1-mediator-vth.py a1-mediator-vth.py +ADD config.json config.json + +RUN mkdir -p /otf/logs + +RUN python -m pip install -r pip-requirements.txt + +ENTRYPOINT ["python", "a1-mediator-vth.py"] diff --git a/a1-mediator-vth/docker/container-tag.yaml b/a1-mediator-vth/docker/container-tag.yaml new file mode 100644 index 0000000..ee078db --- /dev/null +++ b/a1-mediator-vth/docker/container-tag.yaml @@ -0,0 +1,15 @@ +--- +# Copyright (c) 2019 AT&T Intellectual Property. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +tag: 0.0.1 diff --git a/dmaap-vth/Jenkinsfile b/dmaap-vth/Jenkinsfile index dfb3067..31299d2 100644 --- a/dmaap-vth/Jenkinsfile +++ b/dmaap-vth/Jenkinsfile @@ -64,7 +64,7 @@ node("docker"){ stage 'Publish Artifact' withCredentials([usernamePassword(credentialsId: MECHID, usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) { - dir("dmaap-vth") + dir("docker") echo "Artifact: " + IMAGE_NAME sh """ @@ -98,7 +98,7 @@ node("docker"){ withCredentials([file(credentialsId: KUBE_CONFIG, variable: 'KUBECONFIG')]) { - dir('dmaap-vth/helm'){ + dir('helm'){ //check if charts are valid, and then perform dry run, if successful then upgrade/install charts if (PHASES.contains("UNDEPLOY") ) { diff --git a/dmaap-vth/Dockerfile b/dmaap-vth/docker/Dockerfile similarity index 100% rename from dmaap-vth/Dockerfile rename to dmaap-vth/docker/Dockerfile diff --git a/dmaap-vth/docker/container-tag.yaml b/dmaap-vth/docker/container-tag.yaml new file mode 100644 index 0000000..ee078db --- /dev/null +++ b/dmaap-vth/docker/container-tag.yaml @@ -0,0 +1,15 @@ +--- +# Copyright (c) 2019 AT&T Intellectual Property. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +tag: 0.0.1 diff --git a/o1-vth/Doc/o1-documentation.docx b/smo-o1-vth/Doc/o1-documentation.docx similarity index 100% rename from o1-vth/Doc/o1-documentation.docx rename to smo-o1-vth/Doc/o1-documentation.docx diff --git a/o1-vth/Jenkinsfile b/smo-o1-vth/Jenkinsfile similarity index 96% rename from o1-vth/Jenkinsfile rename to smo-o1-vth/Jenkinsfile index 8da4b07..b7eca87 100644 --- a/o1-vth/Jenkinsfile +++ b/smo-o1-vth/Jenkinsfile @@ -65,7 +65,7 @@ node("docker"){ withCredentials([usernamePassword(credentialsId: MECHID, usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) { - dir("o1-vth"){ + dir("docker"){ echo "Artifact: " + IMAGE_NAME sh """ @@ -100,7 +100,7 @@ node("docker"){ withCredentials([file(credentialsId: KUBE_CONFIG, variable: 'KUBECONFIG')]) { - dir('o1-vth/helm'){ + dir('helm'){ //check if charts are valid, and then perform dry run, if successful then upgrade/install charts if (PHASES.contains("UNDEPLOY") ) { diff --git a/o1-vth/config.ini b/smo-o1-vth/config.ini similarity index 100% rename from o1-vth/config.ini rename to smo-o1-vth/config.ini diff --git a/o1-vth/Dockerfile b/smo-o1-vth/docker/Dockerfile similarity index 100% rename from o1-vth/Dockerfile rename to smo-o1-vth/docker/Dockerfile diff --git a/smo-o1-vth/docker/container-tag.yaml b/smo-o1-vth/docker/container-tag.yaml new file mode 100644 index 0000000..ee078db --- /dev/null +++ b/smo-o1-vth/docker/container-tag.yaml @@ -0,0 +1,15 @@ +--- +# Copyright (c) 2019 AT&T Intellectual Property. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +tag: 0.0.1 diff --git a/o1-vth/helm/o1-vth/.helmignore b/smo-o1-vth/helm/o1-vth/.helmignore similarity index 100% rename from o1-vth/helm/o1-vth/.helmignore rename to smo-o1-vth/helm/o1-vth/.helmignore diff --git a/o1-vth/helm/o1-vth/Chart.yaml b/smo-o1-vth/helm/o1-vth/Chart.yaml similarity index 82% rename from o1-vth/helm/o1-vth/Chart.yaml rename to smo-o1-vth/helm/o1-vth/Chart.yaml index 35abef6..5fb9d09 100644 --- a/o1-vth/helm/o1-vth/Chart.yaml +++ b/smo-o1-vth/helm/o1-vth/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 appVersion: "1.0" description: A Helm chart for the o1 Virtual Test Head -name: o1-vth +name: smo-o1-vth version: 0.0.1 diff --git a/o1-vth/helm/o1-vth/templates/deployment.yaml b/smo-o1-vth/helm/o1-vth/templates/deployment.yaml similarity index 100% rename from o1-vth/helm/o1-vth/templates/deployment.yaml rename to smo-o1-vth/helm/o1-vth/templates/deployment.yaml diff --git a/o1-vth/helm/o1-vth/templates/secret.yaml b/smo-o1-vth/helm/o1-vth/templates/secret.yaml similarity index 100% rename from o1-vth/helm/o1-vth/templates/secret.yaml rename to smo-o1-vth/helm/o1-vth/templates/secret.yaml diff --git a/o1-vth/helm/o1-vth/templates/service.yaml b/smo-o1-vth/helm/o1-vth/templates/service.yaml similarity index 100% rename from o1-vth/helm/o1-vth/templates/service.yaml rename to smo-o1-vth/helm/o1-vth/templates/service.yaml diff --git a/o1-vth/helm/o1-vth/values.yaml b/smo-o1-vth/helm/o1-vth/values.yaml similarity index 84% rename from o1-vth/helm/o1-vth/values.yaml rename to smo-o1-vth/helm/o1-vth/values.yaml index 66a2c9c..012a940 100644 --- a/o1-vth/helm/o1-vth/values.yaml +++ b/smo-o1-vth/helm/o1-vth/values.yaml @@ -1,7 +1,7 @@ -appName: o1-vth +appName: smo-o1-vth env: dev version: 0.0.1-SNAPSHOT -image: o1-vth:0.0.1-SNAPSHOT +image: smo-o1-vth:0.0.1-SNAPSHOT namespace: org-oran-otf nodePort: 32130 replicas: 1 diff --git a/o1-vth/o1_vth.py b/smo-o1-vth/o1_vth.py similarity index 95% rename from o1-vth/o1_vth.py rename to smo-o1-vth/o1_vth.py index 3732d75..1cc63f7 100644 --- a/o1-vth/o1_vth.py +++ b/smo-o1-vth/o1_vth.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # # limitations under the License. # ################################################################################ -# File name: o1-vth.py # +# File name: smo-o1-vth.py # # Description: Mainly used to get alarm list # # Date created: 04/14/2020 # # Python Version: 3.7 # @@ -136,7 +136,7 @@ def getHealth(): return 'UP' if __name__ == '__main__': - logHandler = FileHandler('o1-vth.log', mode='a') + logHandler = FileHandler('smo-o1-vth.log', mode='a') logHandler.setLevel(logging.INFO) app.logger.setLevel(logging.INFO) app.logger.addHandler(logHandler) diff --git a/o1-vth/pip-requirements.txt b/smo-o1-vth/pip-requirements.txt similarity index 100% rename from o1-vth/pip-requirements.txt rename to smo-o1-vth/pip-requirements.txt