Merge "Removing custom log level in aaa and using master images for BBSim and openolt adapter in scale test"
diff --git a/jjb/build_openolt_deb.yaml b/jjb/build_openolt_deb.yaml
index 390c398..3969181 100644
--- a/jjb/build_openolt_deb.yaml
+++ b/jjb/build_openolt_deb.yaml
@@ -21,7 +21,7 @@
gerrit-server-name: '{gerrit-server-name}'
project-regexp: '^(openolt)$'
branch-regexp: '{modern-branches-regexp}'
- file-include-regexp: '{doc-files-regexp}'
+ file-include-regexp: '{all-files-regexp}'
dependency-jobs: '{dependency-jobs}'
properties:
diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index e0280db..48174ad 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -129,7 +129,6 @@
# for matching files with file-include-regexp
all-files-regexp: '.*'
- doc-files-regexp: '^docs/.*'
# regex to allow docs-only patchsets w/version bumps to skip code-level
# tests. Have to also ignore the commit message on negative match,
diff --git a/jjb/docs-legacy.yaml b/jjb/docs-legacy.yaml
deleted file mode 100644
index 1151e17..0000000
--- a/jjb/docs-legacy.yaml
+++ /dev/null
@@ -1,109 +0,0 @@
----
-# Legacy CORD documentation verification and publish tasks
-
-- project:
- name: verify-docs-legacy
-
- jobs:
- - 'verify-documentation-legacy':
- project-regexp: '^(cord|platform-install|cord-tester|rcord|ecord|mcord|opencloud|xos|xos-gui|xos-tosca)$'
- branch-regexp: '{legacy-branches-regexp}'
-
-- project:
- name: publish-docs-legacy
-
- jobs:
- - 'publish-documentation-legacy':
- project-regexp: '^(cord|platform-install|cord-tester|rcord|ecord|mcord|opencloud|xos|xos-gui|xos-tosca)$'
- branch-regexp: '{legacy-branches-regexp}'
-
-- job-template:
- id: verify-documentation-legacy
- name: "verify-documentation-legacy"
-
- triggers:
- - cord-infra-gerrit-trigger-patchset:
- gerrit-server-name: '{gerrit-server-name}'
- project-regexp: '{project-regexp}'
- branch-regexp: '{branch-regexp}'
- file-include-regexp: '{doc-files-regexp}'
- dependency-jobs: '{dependency-jobs}'
-
- properties:
- - cord-infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
- artifact-num-to-keep: '{artifact-num-to-keep}'
-
- wrappers:
- - lf-infra-wrappers:
- build-timeout: '{build-timeout}'
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
- scm:
- - cord-infra-gerrit-repo-scm:
- manifest-url: '{gerrit-server-url}/{cord-repo-manifest}'
- branch: '$GERRIT_BRANCH'
- destination-dir: 'cord'
-
- node: '{build-node}'
- project-type: freestyle
- concurrent: false
-
- builders:
- - cord-infra-gerrit-repo-patch:
- destination-dir: 'cord'
- project: '$GERRIT_PROJECT'
- change-number: '$GERRIT_CHANGE_NUMBER'
- patchset-number: '$GERRIT_PATCHSET_NUMBER'
- - shell: |
- cd cord/build/docs
- make test
-
-- job-template:
- id: publish-documentation-legacy
- name: 'publish-documentation-legacy'
-
- triggers:
- - cord-infra-gerrit-trigger-merge:
- gerrit-server-name: '{gerrit-server-name}'
- project-regexp: '{project-regexp}'
- branch-regexp: '{branch-regexp}'
- file-include-regexp: '{doc-files-regexp}'
- dependency-jobs: '{dependency-jobs}'
-
- properties:
- - cord-infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
- artifact-num-to-keep: '{artifact-num-to-keep}'
-
- wrappers:
- - lf-infra-wrappers:
- build-timeout: '{build-timeout}'
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
- scm:
- - cord-infra-gerrit-repo-scm:
- manifest-url: '{gerrit-server-url}/{cord-repo-manifest}'
- branch: '$GERRIT_BRANCH'
- destination-dir: 'cord'
-
- node: '{build-node}'
- project-type: freestyle
- concurrent: false
-
- builders:
- - shell: |
- #!/usr/bin/env bash
-
- # Set up the ssh host keys for the docs host
- mkdir -p ~/.ssh
- echo '{docs-ssh-host-key}' >> ~/.ssh/known_hosts
-
- # build the docs
- cd cord/docs
- make build
-
- # copy swagger REST API docs first, then exclude deleting them when copying rest of guide
- rsync -rvzh --delete _book/ {docs-ssh-host}:/var/www/guide/$GERRIT_BRANCH
- rsync -rvzh --delete xos/swagger/ {docs-ssh-host}:/var/www/guide/$GERRIT_BRANCH/swagger
-
diff --git a/jjb/docs.yaml b/jjb/docs.yaml
deleted file mode 100644
index c1b244d..0000000
--- a/jjb/docs.yaml
+++ /dev/null
@@ -1,252 +0,0 @@
----
-# CORD documentation verification and publish tasks
-
-- project:
- name: verify-docs
-
- jobs:
- - 'verify-documentation':
- other-docs-repos-regexp: '{cord-guide-projects-regexp}'
- branch-regexp: '{modern-branches-regexp}'
-
-- project:
- name: publish-docs
-
- jobs:
- - 'publish-documentation':
- other-docs-repos-regexp: '{cord-guide-projects-regexp}'
- branch-regexp: '{modern-branches-regexp}'
-
-- project:
- name: publish-xos-docs
-
- jobs:
- - 'publish-xos-documentation':
- branch-regexp: '{modern-branches-regexp}'
-
-- job-template:
- id: verify-documentation
- name: "verify-documentation"
-
- triggers:
- - gerrit:
- server-name: '{gerrit-server-name}'
- dependency-jobs: '{dependency-jobs}'
- silent-start: true
- trigger-on:
- - patchset-created-event:
- exclude-drafts: true
- exclude-trivial-rebase: false
- exclude-no-code-change: true
- - draft-published-event
- - comment-added-contains-event:
- comment-contains-value: '(?i)^.*recheck$'
- projects:
- - project-compare-type: PLAIN
- project-pattern: 'docs'
- branches:
- - branch-compare-type: REG_EXP
- branch-pattern: '{branch-regexp}'
- file-paths:
- - compare-type: REG_EXP
- pattern: '{all-files-regexp}'
- - project-compare-type: REG_EXP
- project-pattern: '{other-docs-repos-regexp}'
- branches:
- - branch-compare-type: REG_EXP
- branch-pattern: '{branch-regexp}'
- file-paths:
- - compare-type: REG_EXP
- pattern: '{doc-files-regexp}'
- - compare-type: REG_EXP
- pattern: '.*\.md'
-
- properties:
- - cord-infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
- artifact-num-to-keep: '{artifact-num-to-keep}'
-
- wrappers:
- - lf-infra-wrappers:
- build-timeout: '20'
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
- scm:
- - cord-infra-gerrit-repo-scm:
- manifest-url: '{gerrit-server-url}/{cord-repo-manifest}'
- branch: '$GERRIT_BRANCH'
- destination-dir: 'cord'
-
- node: 'ubuntu16.04-basebuild-1c-2g'
- project-type: freestyle
- concurrent: false
-
- builders:
- - cord-infra-gerrit-repo-patch:
- destination-dir: 'cord'
- project: '$GERRIT_PROJECT'
- change-number: '$GERRIT_CHANGE_NUMBER'
- patchset-number: '$GERRIT_PATCHSET_NUMBER'
- - shell: |
- #!/usr/bin/env bash
-
- # checkout is under cord
- cd cord
-
- # make repos checkout directory
- mkdir -p docs/repos
-
- # Find path to the repo, copy into docs
- PROJECT_PATH=$(xmllint --xpath "string(//project[@name=\"$GERRIT_PROJECT\"]/@path)" .repo/manifests/default.xml)
- cp -r "$PROJECT_PATH" "docs/repos/$GERRIT_PROJECT"
-
- # build docs, don't touch checkout under test, capture test result
- cd docs
- SKIP_CHECKOUT="$GERRIT_PROJECT" make test
- test_result=$?
-
- # cleanup
- make clean
-
- exit $test_result
-
- publishers:
- - email:
- recipients: 'teo@opennetworking.org,smbaker@opennetworking.org,andy@opennetworking.org,zdw@opennetworking.org'
-
-- job-template:
- id: publish-documentation
- name: 'publish-documentation'
-
- triggers:
- - gerrit:
- server-name: '{gerrit-server-name}'
- dependency-jobs: '{dependency-jobs}'
- silent-start: true
- trigger-on:
- - change-merged-event
- projects:
- - project-compare-type: PLAIN
- project-pattern: 'docs'
- branches:
- - branch-compare-type: REG_EXP
- branch-pattern: '{branch-regexp}'
- file-paths:
- - compare-type: REG_EXP
- pattern: '{all-files-regexp}'
- - project-compare-type: REG_EXP
- project-pattern: '{other-docs-repos-regexp}'
- branches:
- - branch-compare-type: REG_EXP
- branch-pattern: '{branch-regexp}'
- file-paths:
- - compare-type: REG_EXP
- pattern: '{doc-files-regexp}'
- - compare-type: REG_EXP
- pattern: '.*\.md'
-
- properties:
- - cord-infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
- artifact-num-to-keep: '{artifact-num-to-keep}'
-
- wrappers:
- - lf-infra-wrappers:
- build-timeout: '20'
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
- scm:
- - cord-infra-gerrit-repo-scm:
- manifest-url: '{gerrit-server-url}/{cord-repo-manifest}'
- branch: '$GERRIT_BRANCH'
- destination-dir: 'cord'
-
- node: 'ubuntu16.04-basebuild-1c-2g'
- project-type: freestyle
- concurrent: false
-
- builders:
- - shell: |
- #!/usr/bin/env bash
- set -e -o pipefail
-
- # Set up the ssh host keys for the docs host
- mkdir -p ~/.ssh
- echo '{docs-ssh-host-key}' >> ~/.ssh/known_hosts
-
- # build gitbook docs
- cd $WORKSPACE/cord/docs
-
- make build
- rsync -rvzh --delete _book/ {docs-ssh-host}:/var/www/guide/$GERRIT_BRANCH
-
- # build swagger docs
- cd $WORKSPACE/cord/orchestration/xos/docs
- make swagger_docs
- rsync -rvzh --delete swagger/ {docs-ssh-host}:/var/www/guide/$GERRIT_BRANCH/swagger
-
- publishers:
- - email:
- recipients: 'teo@opennetworking.org,smbaker@opennetworking.org,andy@opennetworking.org,zdw@opennetworking.org'
-
-- job-template:
- id: publish-xos-documentation
- name: 'publish-xos-documentation'
-
- triggers:
- - gerrit:
- server-name: '{gerrit-server-name}'
- dependency-jobs: '{dependency-jobs}'
- silent-start: true
- trigger-on:
- - change-merged-event
- projects:
- - project-compare-type: PLAIN
- project-pattern: 'xos'
- branches:
- - branch-compare-type: REG_EXP
- branch-pattern: '{branch-regexp}'
- file-paths:
- - compare-type: REG_EXP
- pattern: '{doc-files-regexp}'
- - compare-type: REG_EXP
- pattern: '.*\.md'
-
- properties:
- - cord-infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
- artifact-num-to-keep: '{artifact-num-to-keep}'
-
- wrappers:
- - lf-infra-wrappers:
- build-timeout: '20'
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
- scm:
- - cord-infra-gerrit-repo-scm:
- manifest-url: '{gerrit-server-url}/xos-manifest.git'
- branch: '$GERRIT_BRANCH'
- destination-dir: 'cord'
-
- node: 'ubuntu16.04-basebuild-1c-2g'
- project-type: freestyle
- concurrent: false
-
- builders:
- - shell: |
- #!/usr/bin/env bash
- set -e -o pipefail
-
- # Set up the ssh host keys for the docs host
- mkdir -p ~/.ssh
- echo '{docs-ssh-host-key}' >> ~/.ssh/known_hosts
-
- # build gitbook docs
- cd $WORKSPACE/cord/xos-core/docs
-
- make build
- rsync -rvzh --delete _book/ guide.opencord.org:/var/www/xos-guide
-
- publishers:
- - email:
- recipients: 'teo@opennetworking.org,smbaker@opennetworking.org,andy@opennetworking.org,zdw@opennetworking.org'
diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index 51640fb..c0dad32 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -25,7 +25,7 @@
edge-config: 'ace-menlo/app_values'
- 'omec-ng40-test':
pod: 'dev'
- build-node: 'ng40-host-node'
+ build-node: 'omec-ci'
ng40-vm: 'ng40@192.168.122.101'
cp-context: 'dev-central-gcp'
dp-context: 'dev-edge-onf-menlo'
@@ -663,7 +663,7 @@
parameters:
- string:
name: buildNode
- default: 'ng40-host-node'
+ default: 'omec-ci'
description: 'Name of the Jenkins executor node to run the job on'
- string: