summaryrefslogtreecommitdiffstats
path: root/ci
AgeCommit message (Collapse)AuthorFilesLines
2017-03-21bugfix hardcoded network configurationSerenaFeng1-1/+3
Change-Id: I1fb6036a2805ccb9bdbe23622514ccd9d997c1a5 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-03-17distinguish virtual and bm deployzhouya1-2/+4
Change-Id: I9fcc4f08283c832d32c22c2195401dd86ecf9dc5 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-03-16unify the definition of NETWORK and NETWORK_CONF.highlight .hll { background-color: #ffffcc } .highlight .c { color: #888888 } /* Comment */ .highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */ .highlight .k { color: #008800; font-weight: bold } /* Keyword */ .highlight .ch { color: #888888 } /* Comment.Hashbang */ .highlight .cm { color: #888888 } /* Comment.Multiline */ .highlight .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */ .highlight .cpf { color: #888888 } /* Comment.PreprocFile */ .highlight .c1 { color: #888888 } /* Comment.Single */ .highlight .cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */ .highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */ .highlight .ge { font-style: italic } /* Generic.Emph */ .highlight .gr { color: #aa0000 } /* Generic.Error */ .highlight .gh { color: #333333 } /* Generic.Heading */ .highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */ .highlight .go { color: #888888 } /* Generic.Output */ .highlight .gp { color: #555555 } /* Generic.Prompt */ .highlight .gs { font-weight: bold } /* Generic.Strong */ .highlight .gu { color: #666666 } /* Generic.Subheading */ .highlight .gt { color: #aa0000 } /* Generic.Traceback */ .highlight .kc { color: #008800; font-weight: bold } /* Keyword.Constant */ .highlight .kd { color: #008800; font-weight: bold } /* Keyword.Declaration */ .highlight .kn { color: #008800; font-weight: bold } /* Keyword.Namespace */ .highlight .kp { color: #008800 } /* Keyword.Pseudo */ .highlight .kr { color: #008800; font-weight: bold } /* Keyword.Reserved */ .highlight .kt { color: #888888; font-weight: bold } /* Keyword.Type */ .highlight .m { color: #0000DD; font-weight: bold } /* Literal.Number */ .highlight .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */ .highlight .na { color: #336699 } /* Name.Attribute */ .highlight .nb { color: #003388 } /* Name.Builtin */ .highlight .nc { color: #bb0066; font-weight: bold } /* Name.Class */ .highlight .no { color: #003366; font-weight: bold } /* Name.Constant */ .highlight .nd { color: #555555 } /* Name.Decorator */ .highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */ .highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */ .highlight .nl { color: #336699; font-style: italic } /* Name.Label */ .highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */ .highlight .py { color: #336699; font-weight: bold } /* Name.Property */ .highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */ .highlight .nv { color: #336699 } /* Name.Variable */ .highlight .ow { color: #008800 } /* Operator.Word */ .highlight .w { color: #bbbbbb } /* Text.Whitespace */ .highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */ .highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ .highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ .highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */ .highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ .highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */ .highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
{
  "name": "yard-stick-gui2",
  "version": "0.0.0",
  "dependencies": {
    "angular": "^1.4.0",
    "bootstrap": "^3.2.0",
    "angular-strap": "^2.3.12",
    "angular-ui-router": "^1.0.3",
    "angular-animate": "^1.6.4",
    "angular-breadcrumb": "^0.5.0",
    "angular-wizard": "^0.10.0",
    "angular-resource": "^1.6.4",
    "ng-file-upload": "^12.2.13",
    "AngularJS-Toaster": "angularjs-toaster#^2.1.0",
    "ng-dialog": "^1.3.0",
    "angularUtils-pagination": "angular-utils-pagination#^0.11.1",
    "components-font-awesome": "^4.7.0",
    "ngstorage": "^0.3.11",
    "v-accordion": "^1.6.0",
    "angular-loading": "^0.1.4",
    "angular-bootstrap": "^2.5.0",
    "angular-sanitize": "^1.6.5"
  },
   "resolutions": {
    "angular": "~1.6.x"
  },
  "devDependencies": {
    "angular-mocks": "^1.4.0"
  },
  "appPath": "app",
  "moduleName": "yardStickGui2App",
  "overrides": {
    "bootstrap": {
      "main": [
        "less/bootstrap.less",
        "dist/css/bootstrap.css",
        "dist/js/bootstrap.js"
      ]
    },
    "angular-loading": {
      "main": [
        "angular-loading.css",
        "angular-loading.js",
        "../spin.js/spin.js"
      ]
    }
  }
}
&d=retro' />Alex Yang1-1/+1 Replace $containers_to_kill with $volumes_to_remove in docker volumes removing. Change-Id: I715ff135099be0a8c9424ab3f94509ee72558415 Signed-off-by: Alex Yang <yangyang1@zte.com.cn> 2017-03-02End deployment when timeoutAlex Yang1-1/+7 Change-Id: Iaae02bfc69450d6138b7b187ec23e4ed2eef6138 Signed-off-by: Alex Yang <yangyang1@zte.com.cn> 2017-02-28Fix daisycloud-core to a specific tagZhijiang1-0/+9 Change-Id: Ife00fdc3409711f8d2de54f03a2a48f778761f80 Signed-off-by: Zhijiang <hu.zhijiang@zte.com.cn> 2017-02-25Make opnfv.bin executableAlex Yang1-2/+5 The downloaded opnfv.bin file has no executable attribute, although it has +x in building-job. Change-Id: I38347db6de2630e0a92106df22b027efa20d4498 Signed-off-by: Alex Yang <yangyang1@zte.com.cn> 2017-02-23Merge "Baremetal Deployment on zte-pod2 JIRA: DAISY-30"Zhijiang Hu1-25/+54 2017-02-22Merge "Add executable attribute to opnfv bin file"Zhijiang Hu2-0/+6 2017-02-22Add executable attribute to opnfv bin fileAlex Yang2-0/+6 1. Add executable attribute to the build-output bin file 2. Determine whether the bin file exists and is excutable before deployment Change-Id: I95b43c9efacfbd47a5f570dac793c0a8d3fe9bbb Signed-off-by: Alex Yang <yangyang1@zte.com.cn> 2017-02-22Baremetal Deployment on zte-pod2Zhou Ya1-25/+54 JIRA: DAISY-30 Change-Id: Ie34180b9d036797d310f612caa189b0a06efb732 Signed-off-by: Zhou Ya <zhou.ya@zte.com.cn> 2017-02-22missing a $ bere varJulien1-1/+1 Change-Id: Ida548591f4e793bc28f4a8df31c07356cee9a82a Signed-off-by: Julien <zhang.jun3g@zte.com.cn> 2017-02-17Add missing bracketsAlex Yang1-1/+1 Change-Id: Ia1f437cad2c4d42e72d4b53cdd6a4f7f00a29edf Signed-off-by: Alex Yang <yangyang1@zte.com.cn> 2017-02-16Fix some typo mistakesAlex Yang1-3/+3 Change-Id: If85c06459cda8392827920928b7d65f7e70fc82b Signed-off-by: Alex Yang <yangyang1@zte.com.cn> 2017-02-14Refactor for get_para_from_deployJulien1-31/+24 Change-Id: I6d8fb4df38bf0749222a2b967a76222c273a7549 Signed-off-by: Julien <zhang.jun3g@zte.com.cn> 2017-02-14refactor for ssh callJulien1-20/+16 Be easy to understand Change-Id: I385569342b96d21f8a9ac6bfb68c92ba424f03ae Signed-off-by: Julien <zhang.jun3g@zte.com.cn> 2017-02-14Merge "Use securedlab for configuration"Zhijiang Hu1-16/+74 2017-02-12Use securedlab for configurationJulien1-16/+74 1. Use labname and podname to fetch configuration files; 2. Support dry-run, which just print the parameters passed without physically deployment; 3. Add Bridge parameter from POD JIRA: DAISY-40 Change-Id: I8cda3f47746d526f442b420a7a4101f84e9ad002 Signed-off-by: Julien <zhang.jun3g@zte.com.cn> 2017-02-10Merge "Add parameters support for deploy"Zhijiang Hu1-9/+101 2017-02-07Resolve build silent failureZhijiang Hu1-1/+24 1) Add "-f" to docker rmi command, otherwise we encountered "Error response from daemon: conflict: unable to remove repository ..." 2) Remove "2>&1" to get error message printed out if present. 3) Add cleanup_container, otherwise we got "Error response from daemon: Conflict. The name "/daisy" is already in use by container" Change-Id: Ic5cecb34699c6fbe0d3af45be38633d35bdfc89f Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn> 2017-02-06Add parameters support for deployJulien1-9/+101 JIRA: DAISY-29 Change-Id: I53a08f2fa458028a59597d1b7a0c7b9137e40dd7 Signed-off-by: Julien <zhang.jun3g@zte.com.cn> 2017-01-19remove centos7.qcow2Yao Lu1-2/+3 every time before deploy,we need new centos7.qcow2. Change-Id: I295ed192674a31290b25042c0843875b93831ebc Signed-off-by: Yao Lu <lu.yao135@zte.com.cn> 2017-01-12Use different variables for local workspace and remote workspaceAlex Yang1-11/+18 1. get local WORKSPACE from the script path 2. use REMOTE_SPACE for jumpserver, WORKSPACE for local 3. specify the vm storage directory Change-Id: I7ff17d40819b6a74ce81862c32ce4a71b3eb8c73 Signed-off-by: Alex Yang <yangyang1@zte.com.cn> 2017-01-07Merge "Run docker from dockerhub"Zhijiang Hu1-31/+5 2017-01-05Run docker from dockerhubJulien1-31/+5 1. Use the build image in releng; 2. Pull down the newest image and run; 3. Delete unused codes; wait from docker image build(26449) and upload in the dockerhub Change-Id: I72b072aff6cd905b426451768dc51d17eee6c0a3 Signed-off-by: Julien <zhang.jun3g@zte.com.cn> 2017-01-04clean up env before deployZhou Ya1-8/+33 1、modify function param standarded 2、modify centos version 3、clean up net and host before deploy 4、modify daisyserver password and node size Change-Id: I9cbf4c5ed9984b12941afc8e45dba216f2b5ee0d Signed-off-by: Zhou Ya <zhou.ya@zte.com.cn> 2017-01-03Merge "fix "No space" error in docker building"Zhijiang Hu1-6/+9 2017-01-03Merge "Add git branch & tag info to version file"Zhijiang Hu1-2/+11 2017-01-03Fix bug in removing docker containers and imagesAlex Yang1-3/+2 1. "unexpected unclosed action in range" occurs in "docker inspect -f $ops ..." 2. "No such image" occurs in "docker rmi ..." Change-Id: I1a1ae9441beb3739585c8f2dcb63029b16c0c2fe Signed-off-by: Alex Yang <yangyang1@zte.com.cn> 2016-12-30solve no file of known_hosts bugzhouya1-1/+1 Change-Id: If70e8765709d49a22a4f6c17ab4e2c4589fbf05a Signed-off-by: zhouya <zhou.ya@zte.com.cn> 2016-12-29fix "No space" error in docker buildingAlex Yang1-6/+9 The space of the /root directory in the docker image is only 10G. "No space" occurs in docker building. So the tmp directory should be changed. Change-Id: Idfa831bac88e2b8ea8e4312247611dc9a1dcda65 Signed-off-by: Alex Yang <yangyang1@zte.com.cn> 2016-12-26Add git branch & tag info to version fileZhijiang1-2/+11 Change-Id: I860bcb9d08a9590ed7902e33a925ec1412e67408 Signed-off-by: Zhijiang <hu.zhijiang@zte.com.cn> 2016-12-20implement deploy on virthal podYao Lu1-39/+104 Change-Id: I600e21f0d36f37c75cac4ace5f7225e32ab93d56 Signed-off-by: Yao Lu <lu.yao135@zte.com.cn> 2016-12-19Merge "Container image build script"Zhijiang Hu1-0/+202 2016-12-18Container image build scriptZhijiang1-0/+202 JIRA: DAISY-17 Change-Id: I91a2e27be3eec1e6edc1b5ed2c9b2b91f15f7705 Signed-off-by: Zhijiang <hu.zhijiang@zte.com.cn> 2016-12-12Move Dockerfile to ./docker pathJulien2-52/+1 According to other projects(releng/jjb/releng/opnfv-docker.yml), all the Dockerfiles are put in ./docker path. The daisy docker build procedure will be seperated from daisy bin file build procedure. The daisy docker will be directly used during the bin build procedure. It will help to safe the build time. A seperate job will be created in Jenkins to monitor the Docker changes and will build the docker image. Change-Id: Ib68ec3657d7296041aa9dc99f8e578cb0466679f Signed-off-by: Julien <zhang.jun3g@zte.com.cn> 2016-12-12Miss call cleanup_docker_imageJulien1-2/+1 1. The function 'cleanup_docker_image' is not called by mistake. 2. Use 'docker run --rm' means: docker will automatically delete the containers. It's not necessary to call it in the end of bash file. according to the log: 'No containers to cleanup.' Change-Id: I67b9ff3ed193467669b80d5a19e36fd077af537d Signed-off-by: Julien <zhang.jun3g@zte.com.cn>