diff options
author | Gary Wu <gary.i.wu@huawei.com> | 2018-01-19 11:36:00 -0800 |
---|---|---|
committer | Gary Wu <gary.i.wu@huawei.com> | 2018-01-19 11:36:00 -0800 |
commit | fe1deb3f4a651268b23a180666028014eea06476 (patch) | |
tree | 987f587619a97c077fa164c9daffdb06953a3eaf /packaging/docker | |
parent | e60d218d8a9ca0700e4b1d117ddf7b59fa18194a (diff) |
Clean up unused directories in integration repo
Change-Id: I8e936cda534c074661ba6dd357a92c58a3749555
Issue-ID: INT-391
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'packaging/docker')
-rw-r--r-- | packaging/docker/binaries.csv | 64 | ||||
-rw-r--r-- | packaging/docker/docker-images.csv | 38 | ||||
-rwxr-xr-x | packaging/docker/scripts/build-all-images.sh | 37 | ||||
-rwxr-xr-x | packaging/docker/scripts/gen-all-dockerfiles.sh | 65 | ||||
-rwxr-xr-x | packaging/docker/scripts/gen-dockerfiles.py | 119 | ||||
-rwxr-xr-x | packaging/docker/scripts/gen-dockerfiles.sh | 230 | ||||
-rwxr-xr-x | packaging/docker/scripts/get-latest-build.sh | 19 | ||||
-rwxr-xr-x | packaging/docker/scripts/get-tomcat-version.sh | 19 | ||||
-rwxr-xr-x | packaging/docker/scripts/ls-microservices.py | 26 | ||||
-rwxr-xr-x | packaging/docker/scripts/pull-all-images.sh | 31 | ||||
-rwxr-xr-x | packaging/docker/scripts/push-all-images.sh | 50 | ||||
-rwxr-xr-x | packaging/docker/scripts/verify-dockerfiles.sh | 29 |
12 files changed, 0 insertions, 727 deletions
diff --git a/packaging/docker/binaries.csv b/packaging/docker/binaries.csv deleted file mode 100644 index 81a9809de..000000000 --- a/packaging/docker/binaries.csv +++ /dev/null @@ -1,64 +0,0 @@ -repo,job-trigger-string,service,filename,groupId,artifactId,extension,classifier,ports,mysql,mongodb,tomcat,python,unzip-dir -client-cli,,Open-O Command-Line interface (CLI),client-cli,org.openo.client.cli,client-cli-deployment,zip,,,,,,, -client-gui,,Open-O GUI,client-gui,org.openo.client.gui,integration,zip,,9150,,,TRUE,,webapps/openoui -common-services-auth,,Common Services Authentication,common-services-auth,org.openo.common-services.auth,auth-service-deployment,zip,,8102,TRUE,,TRUE,TRUE, -common-services-common-utilities,wso2bpel,Common Services WSO2 Extension,common-services-wso2ext,org.openo.common-services.common-utilities.wso2bpel-ext,standalone,tar.gz,linux64,8101,TRUE,,,, -common-services-driver-mgr,,Common Services Driver Manager,common-services-drivermanager,org.openo.common-services.driver-mgr,drivermanager-service-deployment,zip,,8103,TRUE,,TRUE,, -common-services-external-system-registration,,Common Services External System Register,common-services-extsys,org.openo.common-services.external-system-registration,standalone,tar.gz,linux64,8100,TRUE,,,, -common-services-microservice-bus,,Common Services Microservice Bus,common-services-msb,org.openo.common-services.microservice-bus,msb-core-standalone,tar.gz,linux64,80 8080,,,,, -common-services-protocol-stack,,Common Services Protocol Stack,common-services-protocolstack,org.openo.common-services.protocol-stack,protocolstackservice-deployment,zip,,8109,,,TRUE,, -common-tosca-aria,,Common TOSCA ARIA,common-tosca-aria,org.openo.common-tosca.aria,aria,zip,,8204,,,,TRUE, -common-tosca-catalog,,Common TOSCA Catalog,common-tosca-catalog,org.openo.common-tosca.catalog,catalog-all,tar.gz,linux64,8200,TRUE,,,, -common-tosca-inventory,,Common TOSCA Inventory,common-tosca-inventory,org.openo.common-tosca.inventory,inventory-standalone,zip,bin,8203 3306,TRUE,TRUE,,, -common-tosca-model-designer,,Common TOSCA Model Designer,common-tosca-modeldesigner,org.openo.common-tosca.model-designer.modeldesigner.distribution,modeldesigner-standalone,tar.gz,linux.gtk.x86_64,8202,,,,, -gso,,GSO Service Gateway,gso-service-gateway,org.openo.gso,service-gateway-deployment,zip,,8305,,,TRUE,, -gso,,GSO Service Manager,gso-service-manager,org.openo.gso,servicemanagerservice-deployment,zip,,8301,TRUE,,TRUE,, -gvnfm-vnflcm,,GVNFM Lifecycle Management,gvnfm-vnflcm,org.openo.gvnfm.vnflcm,gvnfm-vnflcm,zip,,8801,TRUE,,,TRUE, -gvnfm-vnfmgr,,GVNFM Init Configuration and Management,gvnfm-vnfmgr,org.openo.gvnfm.vnfmgr,gvnfm-vnfmgr,zip,,8803,TRUE,,,TRUE, -gvnfm-vnfres,,GVNFM Virtual Resource Management,gvnfm-vnfres,org.openo.gvnfm.vnfres,gvnfm-vnfres,zip,,8802,TRUE,,,TRUE, -nfvo,vim-vimadapter,NFVO VIM Driver,nfvo-driver-vim,org.openo.nfvo,vimadapter-deployment,zip,,8481,,,TRUE,, -nfvo,gvnfm-gvnfmadapter,NFVO VNFM Driver GVNFM,nfvo-driver-vnfm-gvnfm,org.openo.nfvo,drivers-vnfm-gvnfm-gvnfmadapter,zip,,8484,,,,TRUE, -nfvo,svnfm-huawei,NFVO VNFM Driver Huawei,nfvo-driver-vnfm-huawei,org.openo.nfvo,hw-vnfmadapter-deployment,zip,,8482,TRUE,,TRUE,, -nfvo,gvnfm-juju,NFVO VNFM Driver JUJU,nfvo-driver-vnfm-juju,org.openo.nfvo,juju-vnfmadapterservice-deployment,zip,,8483,TRUE,,TRUE,, -nfvo,svnfm-zte,NFVO VNFM Driver ZTE,nfvo-driver-vnfm-zte,org.openo.nfvo,drivers-vnfm-svnfm-zte-vmanager,zip,,8410,,,,TRUE, -nfvo,vnfm-ericsson,NFVO VNFM Driver Ericsson,nfvo-driver-vnfm-ericsson,org.openo.nfvo,ericsson-vnfm-driver-deployment,zip,,8485,,,TRUE,, -nfvo,lcm,NFVO Lifecycle Management,nfvo-lcm,org.openo.nfvo,nfvo-lcm,zip,,8403,TRUE,,,TRUE, -nfvo,resmanagement,NFVO Resource Manager,nfvo-resmanagement,org.openo.nfvo,resmanagement-deployment,zip,,8480,TRUE,,TRUE,, -nfvo,monitor-dac,NFVO Monitor Data Acquire Component,nfvo-dac,org.openo.nfvo.monitor.dac.dac-api,dac-standalone,zip,,8206,,,,, -nfvo,monitor-umc,NFVO Monitor Unified Monitor Component,nfvo-umc,org.openo.nfvo.monitor.umc.umc-api,umc-standalone,zip,,8205,TRUE,,,, -nfvo,sdnc-zte,NFVO SDNC Driver ZTE,nfvo-driver-sdnc-zte,org.openo.nfvo.sfc-driver-standalone,nfvo-drivers-sdnc-zte-sfc-driver,zip,,8411,,,,, -policy-designer,,Policy Designer,policy-designer,org.openo.policy.designer,policydesigner-resource,tar.gz,linux64,8901,TRUE,,,, -policy-engine,,Policy Engine,policy-engine,org.openo.policy.engine,policy-engine-core,tar.gz,linux64,8902,,,,, -policy-lcm,,Policy Lcm,policy-lcm,org.openo.policy.lcm,apply,tar.gz,linux64,8903,,,,, -sdnhub-driver-ct-te,,SDNHUB Driver CT TE,sdnhub-driver-ct-te,org.openo.sdnhub.driver-ct-te,ct_tedriver,zip,,8670,,,,TRUE, -sdnhub-driver-huawei-l3vpn,,SDNHUB Driver Huawei L3VPN,sdnhub-driver-huawei-l3vpn,org.openo.sdnhub.driver-huawei-l3vpn,l3vpndriver-deployment,zip,,8533,,,TRUE,, -sdnhub-driver-huawei-openstack,,SDNHUB Driver Huawei Openstack,sdnhub-driver-huawei-openstack,org.openo.sdnhub.driver-huawei-openstack,osdriverservice-deployment,zip,,8539,,,TRUE,, -sdnhub-driver-huawei-overlay,,SDNHUB Driver Huawei Overlay,sdnhub-driver-huawei-overlay,org.openo.sdnhub.driver-huawei-overlay,overlayvpndriver-deployment,zip,,8536,,,TRUE,, -sdnhub-driver-huawei-servicechain,,SDNHUB Driver Huawei Servicechain,sdnhub-driver-huawei-servicechain,org.openo.sdnhub.driver-huawei-servicechain,servicechaindriverservice-deployment,zip,,8542,,,TRUE,, -sdnhub-driver-zte-sptn,,SDNHUB Driver ZTE SPTN,sdnhub-driver-zte-sptn,org.openo.sdnhub.driver-zte-sptn,standalone,tar.gz,linux64,8640,TRUE,,,, -sdno-brs,,SDNO Services BRS,sdno-service-brs,org.openo.sdno.brs,brs-deployment,zip,,8527,,,TRUE,, -sdno-brs,,SDNO Services MSS,sdno-service-mss,org.openo.sdno.brs,mss-deployment,zip,,8530,TRUE,,TRUE,, -sdno-ipsec,,SDNO Services IpSec,sdno-service-ipsec,org.openo.sdno.ipsec,ipsecservice-deployment,zip,,8515,,,TRUE,, -sdno-l2vpn,,SDNO Services L2VPN,sdno-service-l2vpn,org.openo.sdno.l2vpn,l2vpnservice-deployment,zip,,8509,,,TRUE,, -sdno-l3vpn,,SDNO Services L3VPN,sdno-service-l3vpn,org.openo.sdno.l3vpn,l3vpnservice-deployment,zip,,8506,,,TRUE,, -sdno-lcm,,SDNO Services LCM,sdno-service-lcm,org.openo.sdno.lcm,lcm-deployment,zip,,8535,,,,, -sdno-monitoring,,SDNO Monitoring,sdno-monitoring,org.openo.sdno.monitoring,ct_monitoring,zip,,8610,TRUE,,,TRUE, -sdno-nslcm,,SDNO Services Nslcm,sdno-service-nslcm,org.openo.sdno.nslcm,nslcm-deployment,zip,,8545,,,TRUE,, -sdno-optimize,,SDNO Optimize,sdno-optimize,org.openo.sdno.optimize,ct_optimizer,zip,,8620,TRUE,,,TRUE, -sdno-overlay,,SDNO Services Overlay VPN,sdno-service-overlayvpn,org.openo.sdno.overlay,overlayvpnservice-deployment,zip,,8503,,,TRUE,, -sdno-route,,SDNO Services Route,sdno-service-route,org.openo.sdno.route,routeservice-deployment,zip,,8551,,,TRUE,, -sdno-servicechain,,SDNO Services Service Chain,sdno-service-servicechain,org.openo.sdno.servicechain,servicechainservice-deployment,zip,,8521,,,TRUE,, -sdno-site,,SDNO Services Site,sdno-service-site,org.openo.sdno.site,localsiteservice-deployment,zip,,8548,,,TRUE,, -sdno-vpc,,SDNO Services VPC,sdno-service-vpc,org.openo.sdno.vpc,vpcservice-deployment,zip,,8518,,,TRUE,, -sdno-vsitemgr,,SDNO Vsite Manager,sdno-vsitemgr,org.openo.sdno.vsitemgr,ct_vsitemgr,zip,,8600,TRUE,,,TRUE, -sdno-vxlan,,SDNO Services VxLAN,sdno-service-vxlan,org.openo.sdno.vxlan,vxlanservice-deployment,zip,,8512,,,TRUE,, -vnf-sdk-function-test,,VNF SDK Function Test,vnfsdk-function-test,org.openo.vnf-sdk.function-test,standalone,tar.gz,linux64,8701,TRUE,,,, -nfvo,,VNF SDK Function Test Task,vnf-sdk-function-test-task,org.openo.nfvo,nfvo-functest,zip,,8704,TRUE,,,TRUE, -vnf-sdk-marketplace,,VNF SDK Marketplace,vnf-sdk-marketplace,org.openo.vnf-sdk.marketplace,vnf-sdk-marketplace-deployment,zip,,8702,TRUE,,TRUE,, -vnf-sdk-validate-lc-test,,VNF SDK Validate Lifecycle Test,vnf-sdk-validate-lc-test,org.openo.vnf-sdk.validate-lc-test,lifecycle-test-deployment,zip,,8703,,,TRUE,TRUE, -multivimdriver-broker,,MultiVIM broker,multivim-broker,org.openo.multivimdriver.broker,multivimbroker,zip,,9001,TRUE,,,TRUE, -multivimdriver-openstack,newton,MultiVIM driver of OpenStack Newton,multivim-driver-newton,org.openo.multivimdriver.openstack,multivimdriver-openstack-newton,zip,,9003,TRUE,,,TRUE, -multivimdriver-openstack,kilo,MultiVIM driver of OpenStack Kilo,multivim-driver-kilo,org.openo.multivimdriver.openstack,multivimdriver-openstack-kilo,zip,,9002,TRUE,,,TRUE, -multivimdriver-vmware-vio,vio,MultiVIM driver of VMware VIO,multivim-driver-vio,org.openo.multivimdriver.vmware.vio,multivimdriver-vio,zip,,9004,TRUE,,,TRUE, -holmes-engine-management,,Holmes Engine D,holmes-engine-d-standalone,org.openo.holmes.engine-management,holmes-engine-d-standalone,zip,linux64,8750,TRUE,,,, -holmes-rule-management,,Holmes Rulemgt Standalone,holmes-rulemgt-standalone,org.openo.holmes.rule-management,holmes-rulemgt-standalone,zip,linux64,8751,TRUE,,,, diff --git a/packaging/docker/docker-images.csv b/packaging/docker/docker-images.csv deleted file mode 100644 index f967c0b88..000000000 --- a/packaging/docker/docker-images.csv +++ /dev/null @@ -1,38 +0,0 @@ -project,image,repo,pom,mvn-options,shell-cmd -aai,openecomp/ajsc-aai,aai/aai-service,ajsc-aai/pom.xml,docker:build, -aai,openecomp/data-router,aai/data-router,pom.xml,docker:build, -aai,openecomp/model-loader,aai/model-loader,pom.xml,docker:build, -aai,openecomp/aai-resources,aai/resources,aai-resources/pom.xml,docker:build, -aai,openecomp/search-data-service,aai/search-data-service,pom.xml,docker:build, -aai,openecomp/sparky-be,aai/sparky-be,pom.xml,docker:build, -aai,openecomp/aai-traversal,aai/traversal,aai-traversal/pom.xml,docker:build, -appc,openecomp/appc-image,appc/deployment,pom.xml,-P docker, -dcae,openecomp/dcae-dmaapbc,dcae/dmaapbc,pom.xml,,docker build -f ./Dockerfile . -dcae,,dcae/orch-dispatcher,,,docker build -f ./Dockerfile . -dcae,dcae-controller,dcae/demo,pom.xml,,bash dcae-demo-controller/src/main/docker-build/build.sh -dcae,dcae-inventory,dcae/dcae-inventory,pom.xml,docker:build, -mso,openecomp/mso,mso,packages/docker/pom.xml,-P docker, -mso,openecomp/mso-arquillian,mso,packages/docker/pom.xml,-P docker, -mso,openecomp/wildfly,mso,packages/docker/pom.xml,-P docker, -mso,openecomp/ubuntu-update,mso,packages/docker/pom.xml,-P docker, -mso,openecomp/jacoco,mso,packages/docker/pom.xml,-P docker, -policy,onap/policy/policy-os,policy/docker,pom.xml,,./docker_build.sh -policy,onap/policy/policy-db,policy/docker,pom.xml,,./docker_build.sh -policy,onap/policy/policy-nexus,policy/docker,pom.xml,,./docker_build.sh -policy,onap/policy/policy-base,policy/docker,pom.xml,,./docker_build.sh -policy,onap/policy/policy-pe,policy/docker,pom.xml,,./docker_build.sh -policy,onap/policy/policy-drools,policy/docker,pom.xml,,./docker_build.sh -portal,openecomp/portalapps,portal,pom.xml,,git -C ecompsdkos pull || git clone $GIT_NO_PROJECT/ecompsdkos; git -C dmaapbc pull || git clone $GIT_NO_PROJECT/ui/dmaapbc dmaapbc; cd deliveries; chmod +x *.sh; ./run.sh -portal,openecomp/portaldb,portal,pom.xml,,git -C ecompsdkos pull || git clone $GIT_NO_PROJECT/ecompsdkos; git -C dmaapbc pull || git clone $GIT_NO_PROJECT/ui/dmaapbc dmaapbc; cd deliveries; chmod +x *.sh; ./run.sh -portal,widget-ms,portal,ecomp-portal-widget-ms/pom.xml,docker:build, -sdc,openecomp/sdc-backend,sdc,pom.xml,-P docker, -sdc,openecomp/sdc-frontend,sdc,pom.xml,-P docker, -sdc,openecomp/sdc-cassandra,sdc,pom.xml,-P docker, -sdc,openecomp/sdc-elasticsearch,sdc,pom.xml,-P docker, -sdc,openecomp/sdc-kibana,sdc,pom.xml,-P docker, -sdc,openecomp/sdc-sanity,sdc,pom.xml,-P docker, -sdnc,openecomp/dgbuilder-sdnc-image,sdnc/oam,pom.xml,-P docker, -sdnc,openecomp/sdnc-image,sdnc/oam,pom.xml,-P docker, -sdnc,openecomp/admportal-sdnc-image,sdnc/oam,pom.xml,-P docker, -sdnc,openecomp/ubuntu-sdnc-image,sdnc/oam,pom.xml,-P docker, -vid,openecomp/vid,vid,pom.xml,-P docker, diff --git a/packaging/docker/scripts/build-all-images.sh b/packaging/docker/scripts/build-all-images.sh deleted file mode 100755 index 8137ce71b..000000000 --- a/packaging/docker/scripts/build-all-images.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -# -# Copyright 2016-2017 Huawei Technologies Co., Ltd. -# -# 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. -# -# $1 org - -if [ -z "$1" ]; then - ORG="openoint" -else - ORG=$1 -fi - -set -exu - -VERSION="1.1.0-SNAPSHOT" - -# docker root dir -ROOT=`git rev-parse --show-toplevel`/test/csit/docker - -cd $ROOT -for image in `$ROOT/scripts/ls-microservices.py | sort`; do - echo - echo $image - docker build -t $ORG/$image:$VERSION -t $ORG/$image:latest $image/target -done diff --git a/packaging/docker/scripts/gen-all-dockerfiles.sh b/packaging/docker/scripts/gen-all-dockerfiles.sh deleted file mode 100755 index 531eb3041..000000000 --- a/packaging/docker/scripts/gen-all-dockerfiles.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash -# -# Copyright 2016-2017 Huawei Technologies Co., Ltd. -# -# 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. -# -# $1 autorelease build - -if [ -z "$1" ]; then - BUILD="snapshots" -else - BUILD=$1 -fi - -VERSION="1.1.0-SNAPSHOT" - -# docker root dir -ROOT=`git rev-parse --show-toplevel`/test/csit/docker - -cd $ROOT -for dirsrc in `$ROOT/scripts/ls-microservices.py | sort`; do - $ROOT/scripts/gen-dockerfiles.sh $dirsrc $BUILD & -done -wait - - -mkdir -p $ROOT/target -cat > $ROOT/target/pom.xml <<EOF -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.openo.integration.docker</groupId> - <artifactId>docker-root</artifactId> - <version>${VERSION}</version> - <packaging>pom</packaging> - <build> - <plugins> - <plugin> - <groupId>io.fabric8</groupId> - <artifactId>docker-maven-plugin</artifactId> - <version>0.19.0</version> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - <modules> -EOF -for dirsrc in `$ROOT/scripts/ls-microservices.py | sort`; do -cat >> $ROOT/target/pom.xml <<EOF - <module>../${dirsrc}/target</module> -EOF -done -cat >> $ROOT/target/pom.xml <<EOF - </modules> -</project> -EOF diff --git a/packaging/docker/scripts/gen-dockerfiles.py b/packaging/docker/scripts/gen-dockerfiles.py deleted file mode 100755 index 498727388..000000000 --- a/packaging/docker/scripts/gen-dockerfiles.py +++ /dev/null @@ -1,119 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2016-2017 Huawei Technologies Co., Ltd. -# -# 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. -# -import sys, csv, subprocess, os, shutil, urllib2, argparse - -parser = argparse.ArgumentParser(description='Generate docker image definition for a microservice. The results will be placed under the target/ subdirectory.') -parser.add_argument('microservice', help='filename of microservice as entered in binaries.csv') -parser.add_argument('--build', default="snapshot", help='a specific build to use ("autorelease-????")') - -args = parser.parse_args() - -version = "1.1.0-SNAPSHOT" - -root = subprocess.check_output(["git", "rev-parse", "--show-toplevel"]).rstrip() -path = "{}/test/csit/docker".format(root) -url_template = "https://nexus.open-o.org/service/local/artifact/maven/redirect?r=snapshots&g={0}&a={1}&e={2}&c={3}&v=LATEST" - -found = False - -with open( "{}/autorelease/binaries.csv".format(root), "r" ) as f: - reader = csv.DictReader(f) - - for row in reader: - if row["filename"] == args.microservice: - found = True - print row["filename"] - - if row["classifier"]: - file = "{}-{}-{}.{}".format(row["artifactId"], version, row["classifier"], row["extension"]) - dest = "{}-{}-{}.{}".format(row["filename"], version, row["classifier"], row["extension"]) - else: - file = "{}-{}.{}".format(row["artifactId"], version, row["extension"]) - dest = "{}-{}.{}".format(row["filename"], version, row["extension"]) - - dir = "{}/{}/target".format(path, row["filename"]) - - try: - shutil.rmtree(dir, True) - os.makedirs(dir) - except OSError: - pass - - # create empty Dockerfile if not exists - open( "{}/Dockerfile".format(dir), "a" ).close() - - outfile = open( "{}/50-microservice.txt".format(dir), "w" ) - - outfile.write("# 50-microservice.txt - AUTOGENERATED, DO NOT MODIFY MANUALLY\n\n") - outfile.write("# Set up microservice\n") - if args.build == "snapshot": - redir_url = url_template.format(row["groupId"], row["artifactId"], row["extension"], row["classifier"]) - outfile.write("# {}\n".format(redir_url)) - response = urllib2.urlopen(redir_url) - url = response.geturl() - else: - url = "https://nexus.open-o.org/content/repositories/{}/{}/{}/{}/{}".format(args.build, row["groupId"].replace(".","/"), row["artifactId"], version, file ) - - - outfile.write("RUN wget -q -O {} \"{}\"".format(dest, url)) - # outfile.write("ADD \"{}\" {}\n".format(url, dest)) - - unzip_opt = "" - if row["extension"] == "tar.gz": - if row["unzip-dir"]: - unzip_opt = " -C {}".format(row["unzip-dir"]) - outfile.write(" && tar -xf {}{}".format(dest, unzip_opt)) - elif row["extension"] == "zip": - if row["unzip-dir"]: - unzip_opt = " -d {}".format(row["unzip-dir"]) - outfile.write(" && unzip -q -o -B {}{}".format(dest, unzip_opt)) - outfile.write(" && rm -f {}\n".format(dest)) - - outfile.write("# Set permissions\n") - outfile.write("RUN find . -type d -exec chmod o-w {} \;\n") - outfile.write("RUN find . -name \"*.sh\" -exec chmod +x {} \;\n") - - if row["ports"]: - ports = row["ports"].split() - for port in ports: - outfile.write("EXPOSE {}\n".format(port)) - outfile.write("RUN echo Open-O {} {} \"{}\" > OPENO_VERSION\n".format(row["filename"], version, url)) - outfile.write("\n\n") - - outfile.close() - - - def symlink(flag, template): - try: - os.remove("{}/{}".format(dir, template)) - except OSError: - pass - if flag: - os.symlink("../../templates/{}".format(template), "{}/{}".format(dir, template)) - - symlink(True, "10-basebuild.txt") - symlink(row["python"], "15-python.txt") - symlink(row["mysql"], "20-mysql.txt") - if row["tomcat"]: - # create empty 30-tomcat.txt as marker for gen-dockerfiles.sh - open( "{}/30-tomcat.txt".format(dir), "a" ).close() - symlink(row["mongodb"], "25-mongodb.txt") - symlink(True, "90-entrypoint.txt") - -if not found: - print "Error: microservice {} not found in binaries.csv.".format(args.microservice) - sys.exit(2) diff --git a/packaging/docker/scripts/gen-dockerfiles.sh b/packaging/docker/scripts/gen-dockerfiles.sh deleted file mode 100755 index 5cd926a98..000000000 --- a/packaging/docker/scripts/gen-dockerfiles.sh +++ /dev/null @@ -1,230 +0,0 @@ -#!/bin/bash -# -# Copyright 2016-2017 Huawei Technologies Co., Ltd. -# -# 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. -# -# $1 dirsrc -# $2 autorelease build - -set -e - -dirsrc=$1 - -if [ -z "$2" ]; then - BUILD="snapshots" -else - BUILD=$2 -fi - -VERSION="1.1.0-SNAPSHOT" - -# docker root dir -ROOT=`git rev-parse --show-toplevel`/test/csit/docker - -cd $ROOT -dir=$dirsrc/target -mkdir -p $dir - -if [ "$BUILD" = "snapshots" ]; then - $ROOT/scripts/gen-dockerfiles.py $dirsrc -else - $ROOT/scripts/gen-dockerfiles.py $dirsrc --build $BUILD -fi - -# Update build number in workaround files -for file in `find $dirsrc -name 80-workaround.txt`; do - sed -i "s|autorelease-[0-9]\{4\}|$BUILD|" $file -done - - -cp $ROOT/../../../distribution/LICENSE $dir -cp -f $dirsrc/*.txt $dir 2>/dev/null || : - -if [ -f $dir/20-mysql.txt ]; then - cp $ROOT/templates/init-mysql.sh $dir/init-mysql.sh -else - rm -f $dir/init-mysql.sh -fi - - -# empty 30-tomcat.txt would be created by gen-dockerfiles.py where required -if [ -f $dir/30-tomcat.txt ]; then - TOMCAT_VERSION=`$ROOT/scripts/get-tomcat-version.sh` - cat > $dir/30-tomcat.txt <<EOF -# 30-tomcat.txt - AUTOGENERATED, DO NOT MODIFY MANUALLY -# Set up tomcat -RUN wget -q http://mirrors.ocf.berkeley.edu/apache/tomcat/tomcat-8/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz && tar --strip-components=1 -xf apache-tomcat-${TOMCAT_VERSION}.tar.gz && rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && rm -rf webapps && mkdir -p webapps/ROOT -RUN echo 'export CATALINA_OPTS="\$CATALINA_OPTS -Xms64m -Xmx256m -XX:MaxPermSize=64m"' > /service/bin/setenv.sh -ENV CATALINA_HOME /service - -EOF -fi - - - -cat > $dir/docker-entrypoint.sh <<EOF -#!/bin/bash -# -# Copyright 2016-2017 Huawei Technologies Co., Ltd. -# -# 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. -# -# -# This file was auto-generated by gen-all-dockerfiles.sh; do not modify manually. -# -# $dir/docker-entrypoint.sh -# - -if [ -z "\$SERVICE_IP" ]; then - export SERVICE_IP=\`hostname -i\` -fi -echo -echo Environment Variables: -echo "SERVICE_IP=\$SERVICE_IP" - -EOF - -if [ $dirsrc != "common-services-msb" ]; then - cat >> $dir/docker-entrypoint.sh <<EOF -if [ -z "\$MSB_ADDR" ]; then - echo "Missing required variable MSB_ADDR: Microservices Service Bus address <ip>:<port>" - exit 1 -fi -echo "MSB_ADDR=\$MSB_ADDR" -echo - -# Wait for MSB initialization -echo Wait for MSB initialization -for i in {1..20}; do - curl -sS -m 1 \$MSB_ADDR > /dev/null && break - sleep \$i -done - -EOF -fi - -cat >> $dir/docker-entrypoint.sh <<EOF -echo - -# Configure service based on docker environment variables -./instance-config.sh - -EOF -if [ -f $dir/20-mysql.txt ]; then - cat >> $dir/docker-entrypoint.sh <<EOF -# Start mysql -su mysql -c /usr/bin/mysqld_safe & - -EOF -fi -if [ -f $dir/25-mongodb.txt ]; then - cat >> $dir/docker-entrypoint.sh <<EOF -# Start mongodb -mongod & - -EOF -fi -cat >> $dir/docker-entrypoint.sh <<EOF -# Perform one-time config -if [ ! -e init.log ]; then - # Perform workarounds due to defects in release binary - ./instance-workaround.sh - -EOF -if [ -f $dir/20-mysql.txt ]; then - cat >> $dir/docker-entrypoint.sh <<EOF - # Init mysql; set root password - ./init-mysql.sh - -EOF -fi -cat >> $dir/docker-entrypoint.sh <<EOF - # microservice-specific one-time initialization - ./instance-init.sh - - date > init.log -fi - -# Start the microservice -./instance-run.sh - -EOF - -cat > $dir/Dockerfile <<EOF -# -# This file was auto-generated by gen-all-dockerfiles.sh; do not modify manually. -# -# $dir/Dockerfile -# - -EOF - -cat $dir/*.txt >> $dir/Dockerfile - -for file in instance-config.sh instance-init.sh instance-run.sh instance-workaround.sh; do - if [ ! -f $dirsrc/$file ]; then - cp -n $ROOT/templates/instance-script.sh $dirsrc/$file - fi -done - -cp -f $dirsrc/instance-*.sh $dir -touch $dir/instance-config.sh -touch $dir/instance-init.sh -touch $dir/instance-run.sh -touch $dir/instance-workaround.sh -chmod +x $dir/*.sh - - -cat > $dir/pom.xml <<EOF -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.openo.integration.docker</groupId> - <artifactId>${dirsrc}</artifactId> - <version>${VERSION}</version> - <packaging>docker</packaging> - <build> - <plugins> - <plugin> - <groupId>io.fabric8</groupId> - <artifactId>docker-maven-plugin</artifactId> - <version>0.19.0</version> - <extensions>true</extensions> - <configuration> - <images> - <image> - <name>openoint/${dirsrc}</name> - <build> - <dockerFileDir>.</dockerFileDir> - <tags> - <tag>latest</tag> - </tags> - </build> - </image> - </images> - </configuration> - </plugin> - </plugins> - </build> -</project> -EOF diff --git a/packaging/docker/scripts/get-latest-build.sh b/packaging/docker/scripts/get-latest-build.sh deleted file mode 100755 index 388a6d33c..000000000 --- a/packaging/docker/scripts/get-latest-build.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -# -# Copyright 2016-2017 Huawei Technologies Co., Ltd. -# -# 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. -# - -# get latest autorelease build -curl -sS https://nexus.open-o.org/content/repositories/ | grep autorelease | sed 's|<[^>]*>||g' | sed -r 's|\s+||g' | cut -d/ -f 1 | sort | tail -1 diff --git a/packaging/docker/scripts/get-tomcat-version.sh b/packaging/docker/scripts/get-tomcat-version.sh deleted file mode 100755 index 316a0ec94..000000000 --- a/packaging/docker/scripts/get-tomcat-version.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -# -# Copyright 2016-2017 Huawei Technologies Co., Ltd. -# -# 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. -# - -# get latest 8.5 tomcat version -curl -sS http://mirrors.ocf.berkeley.edu/apache/tomcat/tomcat-8/ | grep v8.5 | sed 's|<[^>]*>||g' | sed -r 's|\s+||g' | sed 's|/.*||g' | sed 's|v||g' | tail -1 diff --git a/packaging/docker/scripts/ls-microservices.py b/packaging/docker/scripts/ls-microservices.py deleted file mode 100755 index 7a7433be3..000000000 --- a/packaging/docker/scripts/ls-microservices.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2016-2017 Huawei Technologies Co., Ltd. -# -# 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. -# - -import sys, csv, subprocess, os, urllib2 - -root = subprocess.check_output(["git", "rev-parse", "--show-toplevel"]).rstrip() - -with open( "{}/autorelease/binaries.csv".format(root), "r" ) as f: - reader = csv.DictReader(f) - - for row in reader: - print row["filename"] diff --git a/packaging/docker/scripts/pull-all-images.sh b/packaging/docker/scripts/pull-all-images.sh deleted file mode 100755 index aee3bb2e3..000000000 --- a/packaging/docker/scripts/pull-all-images.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -# -# Copyright 2016-2017 Huawei Technologies Co., Ltd. -# -# 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. -# - -set -exu - -VERSION="1.1.0-SNAPSHOT" - -# docker root dir -ROOT=`git rev-parse --show-toplevel`/test/csit/docker - -cd $ROOT -for image in `$ROOT/scripts/ls-microservices.py | sort`; do - echo - echo $image - docker pull openoint/$image:$VERSION - docker pull openoint/$image:latest -done diff --git a/packaging/docker/scripts/push-all-images.sh b/packaging/docker/scripts/push-all-images.sh deleted file mode 100755 index 00684c61d..000000000 --- a/packaging/docker/scripts/push-all-images.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash -# -# Copyright 2016-2017 Huawei Technologies Co., Ltd. -# -# 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. -# -# $1 org - -if [ -z "$1" ]; then - ORG="openoint" -else - ORG=$1 -fi - -set -ex - -VERSION="1.1.0-SNAPSHOT" - -# docker root dir -ROOT=`git rev-parse --show-toplevel`/test/csit/docker - -if [ -z "$MVN" ]; then - export MVN=`which mvn` -fi -if [ -z "$MVN" ] && [ -x /w/tools/hudson.tasks.Maven_MavenInstallation/mvn33/bin/mvn ]; then - export MVN="/w/tools/hudson.tasks.Maven_MavenInstallation/mvn33/bin/mvn" -fi - -cd $ROOT -for image in `$ROOT/scripts/ls-microservices.py | sort`; do - echo - echo $image - - if [ ! -z "$MVN" ]; then - $MVN -f $image/target docker:push - else - docker push $ORG/$image:$VERSION - docker push $ORG/$image:latest - fi -done diff --git a/packaging/docker/scripts/verify-dockerfiles.sh b/packaging/docker/scripts/verify-dockerfiles.sh deleted file mode 100755 index e2acbdc90..000000000 --- a/packaging/docker/scripts/verify-dockerfiles.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -# -# Copyright 2016-2017 Huawei Technologies Co., Ltd. -# -# 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. - -# docker root dir -ROOT=`git rev-parse --show-toplevel`/test/csit/docker - -MICROSERVICES=`$ROOT/scripts/ls-microservices.py` - -EXIT_CODE=0 -for dir in `find $ROOT -maxdepth 1 -mindepth 1 -type d ! -name scripts ! -name templates -printf '%f\n'`; do - if ! grep -q $dir <<<$MICROSERVICES; then - echo ERROR: $dir not found in binaries.csv - EXIT_CODE=1 - fi -done -exit $EXIT_CODE |