From 0d45bc887eb1d7d60d5fa79643950ef75a189602 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Mon, 19 Nov 2018 14:25:13 +0100 Subject: [PATCH] Changed default options and values in installers Docker images will use opensourcemano/* by default Change-Id: Iab627373d3747995d96c9c0fa5016ffdf91a9cb4 Signed-off-by: garciadeblas --- docker/mk/Makefile.include | 4 +- installers/docker/docker-compose.yaml | 14 +++--- installers/full_install_osm.sh | 62 ++++++++++++++++---------- installers/install_osm.sh | 2 +- jenkins/ci-pipelines/ci_stage_3.groovy | 2 +- 5 files changed, 50 insertions(+), 34 deletions(-) diff --git a/docker/mk/Makefile.include b/docker/mk/Makefile.include index 2be4d295..ced304aa 100644 --- a/docker/mk/Makefile.include +++ b/docker/mk/Makefile.include @@ -35,7 +35,7 @@ $(MKBUILD)/.dep_%: $Q$(MKINCLUDE)/get_version.sh -r $(REPOSITORY) -R $(RELEASE) -k $(REPOSITORY_KEY) -u $(REPOSITORY_BASE) -m $* > $@ build: $(MKBUILD) $(DEPS_TARGETS) - $Qdocker build -t osm/$(LOWER_MDG):$(TAG) \ + $Qdocker build -t opensourcemano/$(LOWER_MDG):$(TAG) \ --build-arg RELEASE=$(RELEASE) \ --build-arg REPOSITORY=$(REPOSITORY) \ --build-arg REPOSITORY_KEY=$(REPOSITORY_KEY) \ @@ -57,7 +57,7 @@ clean: rm -f $(MKBUILD)/.dep* tag: - docker tag osm/$(CONTAINER_NAME):$(INPUT_TAG) opensourcemano/$(LOWER_MDG):$(TAG) + docker tag opensourcemano/$(CONTAINER_NAME):$(INPUT_TAG) opensourcemano/$(LOWER_MDG):$(TAG) push: tag docker push opensourcemano/$(LOWER_MDG):$(TAG) diff --git a/installers/docker/docker-compose.yaml b/installers/docker/docker-compose.yaml index 29b7857f..5342b305 100644 --- a/installers/docker/docker-compose.yaml +++ b/installers/docker/docker-compose.yaml @@ -69,7 +69,7 @@ services: # ports: # - "3306:3306" keystone: - image: ${DOCKER_USER:-osm}/keystone:${TAG:-latest} + image: ${DOCKER_USER:-opensourcemano}/keystone:${TAG:-latest} networks: - netOSM environment: @@ -79,7 +79,7 @@ services: ports: - "${OSM_KEYSTONE_PORTS:-5000:5000}" nbi: - image: ${DOCKER_USER:-osm}/nbi:${TAG:-latest} + image: ${DOCKER_USER:-opensourcemano}/nbi:${TAG:-latest} networks: - netOSM volumes: @@ -95,7 +95,7 @@ services: # - kafka # - mongo lcm: - image: ${DOCKER_USER:-osm}/lcm:${TAG:-latest} + image: ${DOCKER_USER:-opensourcemano}/lcm:${TAG:-latest} networks: - netOSM volumes: @@ -121,7 +121,7 @@ services: # ports: # - "3306:3306" ro: - image: ${DOCKER_USER:-osm}/ro:${TAG:-latest} + image: ${DOCKER_USER:-opensourcemano}/ro:${TAG:-latest} networks: - netOSM environment: @@ -133,7 +133,7 @@ services: ports: - "${OSM_RO_PORTS:-9090:9090}" mon: - image: ${DOCKER_USER:-osm}/mon:${TAG:-latest} + image: ${DOCKER_USER:-opensourcemano}/mon:${TAG:-latest} networks: - netOSM volumes: @@ -148,7 +148,7 @@ services: #depends_on: # - kafka pol: - image: ${DOCKER_USER:-osm}/pol:${TAG:-latest} + image: ${DOCKER_USER:-opensourcemano}/pol:${TAG:-latest} networks: - netOSM volumes: @@ -160,7 +160,7 @@ services: # - kafka # - mon light-ui: - image: ${DOCKER_USER:-osm}/light-ui:${TAG:-latest} + image: ${DOCKER_USER:-opensourcemano}/light-ui:${TAG:-latest} networks: - netOSM environment: diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index f67ba082..776a5858 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -167,14 +167,14 @@ function uninstall_lightweight() { remove_stack osm_metrics echo "Now osm docker images and volumes will be deleted" newgrp docker << EONG - docker image rm ${DOCKERUSER}/ro - docker image rm ${DOCKERUSER}/lcm - docker image rm ${DOCKERUSER}/light-ui - docker image rm ${DOCKERUSER}/keystone - docker image rm ${DOCKERUSER}/nbi - docker image rm ${DOCKERUSER}/mon - docker image rm ${DOCKERUSER}/pm - docker image rm ${DOCKERUSER}/kafka-exporter + docker image rm ${DOCKER_USER}/ro + docker image rm ${DOCKER_USER}/lcm + docker image rm ${DOCKER_USER}/light-ui + docker image rm ${DOCKER_USER}/keystone + docker image rm ${DOCKER_USER}/nbi + docker image rm ${DOCKER_USER}/mon + docker image rm ${DOCKER_USER}/pm + docker image rm ${DOCKER_USER}/kafka-exporter EONG remove_volumes $OSM_STACK_NAME remove_network $OSM_STACK_NAME @@ -673,7 +673,7 @@ function generate_docker_images() { elif [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q MON ; then git -C ${LWTEMPDIR} clone https://osm.etsi.org/gerrit/osm/MON git -C ${LWTEMPDIR}/MON checkout ${COMMIT_ID} - sg docker -c "docker build ${LWTEMPDIR}/MON -f ${LWTEMPDIR}/MON/docker/Dockerfile -t osm/mon --no-cache" || FATAL "cannot build MON docker image" + sg docker -c "docker build ${LWTEMPDIR}/MON -f ${LWTEMPDIR}/MON/docker/Dockerfile -t ${DOCKER_USER}/mon --no-cache" || FATAL "cannot build MON docker image" fi if [ -n "$PULL_IMAGES" ]; then @@ -681,7 +681,7 @@ function generate_docker_images() { elif [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q MON ; then git -C ${LWTEMPDIR} clone https://osm.etsi.org/gerrit/osm/POL git -C ${LWTEMPDIR}/POL checkout ${COMMIT_ID} - sg docker -c "docker build ${LWTEMPDIR}/POL -f ${LWTEMPDIR}/POL/docker/Dockerfile -t osm/pol --no-cache" || FATAL "cannot build PM docker image" + sg docker -c "docker build ${LWTEMPDIR}/POL -f ${LWTEMPDIR}/POL/docker/Dockerfile -t ${DOCKER_USER}/pol --no-cache" || FATAL "cannot build PM docker image" fi if [ -n "$PULL_IMAGES" ]; then @@ -690,8 +690,8 @@ function generate_docker_images() { elif [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q NBI ; then git -C ${LWTEMPDIR} clone https://osm.etsi.org/gerrit/osm/NBI git -C ${LWTEMPDIR}/NBI checkout ${COMMIT_ID} - sg docker -c "docker build ${LWTEMPDIR}/NBI -f ${LWTEMPDIR}/NBI/Dockerfile.local -t osm/nbi --no-cache" || FATAL "cannot build NBI docker image" - sg docker -c "docker build ${LWTEMPDIR}/NBI/keystone -f ${LWTEMPDIR}/NBI/keystone/Dockerfile -t osm/keystone --no-cache" || FATAL "cannot build KEYSTONE docker image" + sg docker -c "docker build ${LWTEMPDIR}/NBI -f ${LWTEMPDIR}/NBI/Dockerfile.local -t ${DOCKER_USER}/nbi --no-cache" || FATAL "cannot build NBI docker image" + sg docker -c "docker build ${LWTEMPDIR}/NBI/keystone -f ${LWTEMPDIR}/NBI/keystone/Dockerfile -t ${DOCKER_USER}/keystone --no-cache" || FATAL "cannot build KEYSTONE docker image" fi if [ -n "$PULL_IMAGES" ]; then @@ -700,7 +700,7 @@ function generate_docker_images() { sg docker -c "docker pull mysql:5" || FATAL "cannot get mysql docker image" git -C ${LWTEMPDIR} clone https://osm.etsi.org/gerrit/osm/RO git -C ${LWTEMPDIR}/RO checkout ${COMMIT_ID} - sg docker -c "docker build ${LWTEMPDIR}/RO -f ${LWTEMPDIR}/RO/docker/Dockerfile-local -t osm/ro --no-cache" || FATAL "cannot build RO docker image" + sg docker -c "docker build ${LWTEMPDIR}/RO -f ${LWTEMPDIR}/RO/docker/Dockerfile-local -t ${DOCKER_USER}/ro --no-cache" || FATAL "cannot build RO docker image" fi if [ -n "$PULL_IMAGES" ]; then @@ -708,7 +708,7 @@ function generate_docker_images() { elif [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q LCM ; then git -C ${LWTEMPDIR} clone https://osm.etsi.org/gerrit/osm/LCM git -C ${LWTEMPDIR}/LCM checkout ${COMMIT_ID} - sg docker -c "docker build ${LWTEMPDIR}/LCM -f ${LWTEMPDIR}/LCM/Dockerfile.local -t osm/lcm --no-cache" || FATAL "cannot build LCM docker image" + sg docker -c "docker build ${LWTEMPDIR}/LCM -f ${LWTEMPDIR}/LCM/Dockerfile.local -t ${DOCKER_USER}/lcm --no-cache" || FATAL "cannot build LCM docker image" fi if [ -n "$PULL_IMAGES" ]; then @@ -716,13 +716,13 @@ function generate_docker_images() { elif [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q LW-UI ; then git -C ${LWTEMPDIR} clone https://osm.etsi.org/gerrit/osm/LW-UI git -C ${LWTEMPDIR}/LW-UI checkout ${COMMIT_ID} - sg docker -c "docker build ${LWTEMPDIR}/LW-UI -t osm/light-ui -f ${LWTEMPDIR}/LW-UI/docker/Dockerfile --no-cache" || FATAL "cannot build LW-UI docker image" + sg docker -c "docker build ${LWTEMPDIR}/LW-UI -f ${LWTEMPDIR}/LW-UI/docker/Dockerfile -t ${DOCKER_USER}/light-ui --no-cache" || FATAL "cannot build LW-UI docker image" fi if [ -n "$PULL_IMAGES" ]; then sg docker -c "docker pull ${DOCKER_USER}/osmclient:${OSM_DOCKER_TAG}" || FATAL "cannot pull osmclient docker image" elif [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q LW-osmclient; then - sg docker -c "docker build -t osm/osmclient ${BUILD_ARGS[@]} -f $OSM_DEVOPS/docker/osmclient ." + sg docker -c "docker build -t ${DOCKER_USER}/osmclient ${BUILD_ARGS[@]} -f $OSM_DEVOPS/docker/osmclient ." fi echo "Finished generation of docker images" } @@ -881,8 +881,6 @@ function deploy_lightweight() { echo "export PROMETHEUS_TAG=${PROMETHEUS_TAG}" | $WORKDIR_SUDO tee --append $OSM_DOCKER_WORK_DIR/osm_ports.sh echo "export KEYSTONEDB_TAG=${KEYSTONEDB_TAG}" | $WORKDIR_SUDO tee --append $OSM_DOCKER_WORK_DIR/osm_ports.sh - - pushd $OSM_DOCKER_WORK_DIR sg docker -c "source ./osm_ports.sh; docker stack deploy -c $OSM_DOCKER_WORK_DIR/docker-compose.yaml $OSM_STACK_NAME" popd @@ -954,7 +952,7 @@ function deploy_perfmon() { } function install_lightweight() { - OSM_DOCKER_WORK_DIR="$OSM_WORK_DIR/stack/$OSM_STACK_NAME" + [ "${OSM_STACK_NAME}" == "osm" ] || OSM_DOCKER_WORK_DIR="$OSM_WORK_DIR/stack/$OSM_STACK_NAME" [ ! -d "$OSM_DOCKER_WORK_DIR" ] && $WORKDIR_SUDO mkdir -p $OSM_DOCKER_WORK_DIR [ "$USER" == "root" ] && FATAL "You are running the installer as root. The installer is prepared to be executed as a normal user with sudo privileges." @@ -1077,11 +1075,23 @@ function dump_vars(){ echo "TO_REBUILD=$TO_REBUILD" echo "INSTALL_NOLXD=$INSTALL_NOLXD" echo "INSTALL_NODOCKER=$INSTALL_NODOCKER" + echo "INSTALL_NOJUJU=$INSTALL_NOJUJU" echo "RELEASE=$RELEASE" echo "REPOSITORY=$REPOSITORY" echo "REPOSITORY_BASE=$REPOSITORY_BASE" echo "REPOSITORY_KEY=$REPOSITORY_KEY" echo "NOCONFIGURE=$NOCONFIGURE" + echo "OSM_DEVOPS=$OSM_DEVOPS" + echo "OSM_VCA_HOST=$OSM_VCA_HOST" + echo "OSM_VCA_SECRET=$OSM_VCA_SECRET" + echo "NO_HOST_PORTS=$NO_HOST_PORTS" + echo "DOCKER_NOBUILD=$DOCKER_NOBUILD" + echo "WORKDIR_SUDO=$WORKDIR_SUDO" + echo "OSM_WORK_DIR=$OSM_STACK_NAME" + echo "OSM_DOCKER_TAG=$OSM_DOCKER_TAG" + echo "DOCKER_USER=$DOCKER_USER" + echo "OSM_STACK_NAME=$OSM_STACK_NAME" + echo "PULL_IMAGES=$PULL_IMAGES" echo "SHOWOPTS=$SHOWOPTS" echo "Install from specific refspec (-b): $COMMIT_ID" } @@ -1125,6 +1135,7 @@ TO_REBUILD="" INSTALL_NOLXD="" INSTALL_NODOCKER="" INSTALL_NOJUJU="" +INSTALL_NOHOSTCLIENT="" NOCONFIGURE="" RELEASE_DAILY="" SESSION_ID=`date +%s` @@ -1139,20 +1150,22 @@ REPOSITORY_BASE="http://osm-download.etsi.org/repository/osm/debian" WORKDIR_SUDO=sudo OSM_WORK_DIR="/etc/osm" OSM_DOCKER_TAG=latest -DOCKER_USER=osm +DOCKER_USER=opensourcemano +PULL_IMAGES="y" KAFKA_TAG=2.11-1.0.2 PROMETHEUS_TAG=v2.4.3 KEYSTONEDB_TAG=10 OSM_DATABASE_COMMONKEY= ELASTIC_VERSION=6.4.2 -while getopts ":hy-:b:r:k:u:R:l:p:D:o:m:H:S:s:w:t:" o; do +while getopts ":hy-:b:r:k:u:R:l:p:D:o:m:H:S:s:w:t:U:" o; do case "${o}" in h) usage && exit 0 ;; b) COMMIT_ID=${OPTARG} + PULL_IMAGES="" ;; r) REPOSITORY="${OPTARG}" @@ -1170,6 +1183,9 @@ while getopts ":hy-:b:r:k:u:R:l:p:D:o:m:H:S:s:w:t:" o; do REPOSITORY_BASE="${OPTARG}" REPO_ARGS+=(-u "$REPOSITORY_BASE") ;; + U) + DOCKER_USER="${OPTARG}" + ;; l) LXD_REPOSITORY_BASE="${OPTARG}" ;; @@ -1214,7 +1230,7 @@ while getopts ":hy-:b:r:k:u:R:l:p:D:o:m:H:S:s:w:t:" o; do ;; -) [ "${OPTARG}" == "help" ] && usage && exit 0 - [ "${OPTARG}" == "source" ] && INSTALL_FROM_SOURCE="y" && continue + [ "${OPTARG}" == "source" ] && INSTALL_FROM_SOURCE="y" && PULL_IMAGES="" && continue [ "${OPTARG}" == "develop" ] && DEVELOP="y" && continue [ "${OPTARG}" == "uninstall" ] && UNINSTALL="y" && continue [ "${OPTARG}" == "nat" ] && NAT="y" && continue @@ -1237,7 +1253,7 @@ while getopts ":hy-:b:r:k:u:R:l:p:D:o:m:H:S:s:w:t:" o; do [ "${OPTARG}" == "nojuju" ] && INSTALL_NOJUJU="y" && continue [ "${OPTARG}" == "nodockerbuild" ] && DOCKER_NOBUILD="y" && continue [ "${OPTARG}" == "nohostclient" ] && INSTALL_NOHOSTCLIENT="y" && continue - [ "${OPTARG}" == "pullimages" ] && DOCKER_USER="opensourcemano" && PULL_IMAGES=true && continue + [ "${OPTARG}" == "pullimages" ] && continue echo -e "Invalid option: '--$OPTARG'\n" >&2 usage && exit 1 ;; diff --git a/installers/install_osm.sh b/installers/install_osm.sh index 899adb17..bc1adfa6 100755 --- a/installers/install_osm.sh +++ b/installers/install_osm.sh @@ -31,4 +31,4 @@ add_repo() { add_repo "deb [arch=amd64] $REPOSITORY_BASE/$RELEASE $REPOSITORY devops" sudo DEBIAN_FRONTEND=noninteractive apt-get -q update sudo DEBIAN_FRONTEND=noninteractive apt-get install osm-devops -/usr/share/osm-devops/installers/full_install_osm.sh -R $RELEASE -r $REPOSITORY -u $REPOSITORY_BASE -D /usr/share/osm-devops -t releasefive-daily --pullimages "$@" +/usr/share/osm-devops/installers/full_install_osm.sh -R $RELEASE -r $REPOSITORY -u $REPOSITORY_BASE -D /usr/share/osm-devops -t releasefive-daily "$@" diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy index 47ab0e13..38b255b3 100644 --- a/jenkins/ci-pipelines/ci_stage_3.groovy +++ b/jenkins/ci-pipelines/ci_stage_3.groovy @@ -60,7 +60,7 @@ def run_systest(stackName,tagName,testName,envfile=null) { sh(script: "touch ${tempdir}/env") envfile="${tempdir}/env" } - sh "docker run --network net${stackName} --env-file ${envfile} -v ${tempdir}:/usr/share/osm-devops/systest/reports osm/osmclient:${tagName} make -C /usr/share/osm-devops/systest ${testName}" + sh "docker run --network net${stackName} --env-file ${envfile} -v ${tempdir}:/usr/share/osm-devops/systest/reports opensourcemano/osmclient:${tagName} make -C /usr/share/osm-devops/systest ${testName}" sh "cp ${tempdir}/* ." junit '*.xml' } -- 2.25.1