Merge "default nginx-proxy config for OSS"
diff --git a/jenkins/client/job/debian/packages/extra.yml b/jenkins/client/job/debian/packages/extra.yml
index 383a2d3..df9e76e 100644
--- a/jenkins/client/job/debian/packages/extra.yml
+++ b/jenkins/client/job/debian/packages/extra.yml
@@ -189,6 +189,18 @@
dist: xenial
build: pipeline
branch: debian/xenial
+ - package: gerritlib
+ dist: xenial
+ build: pipeline
+ branch: debian/xenial
+ - package: jeepyb
+ dist: xenial
+ build: pipeline
+ branch: debian/xenial
+ - package: salt-pepper
+ dist: xenial
+ build: pipeline
+ branch: debian/xenial
template:
type: workflow-scm
concurrent: false
diff --git a/jenkins/client/job/deploy/kqueen.yml b/jenkins/client/job/deploy/kqueen.yml
new file mode 100644
index 0000000..817eb8f
--- /dev/null
+++ b/jenkins/client/job/deploy/kqueen.yml
@@ -0,0 +1,61 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ deploy_aws_k8s_kqueen_job:
+ name: deploy-aws-k8s-kqueen
+ type: workflow-scm
+ discard:
+ build:
+ keep_num: 20
+ concurrent: true
+ display_name: "Deploy AWS K8S using kqueen"
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
+ credentials: "gerrit"
+ script: deploy-aws-k8s-kqueen-pipeline.groovy
+ param:
+ # deployments
+ STACK_NAME:
+ type: string
+ description: "AWS stack name - mandatory param, will be used as is"
+ STACK_COMPUTE_COUNT:
+ type: string
+ default: '2'
+
+ STACK_TEMPLATE:
+ type: string
+ default: "k8s_ha_calico_sm"
+ STACK_TEMPLATE_URL:
+ type: string
+ default: "${_param:jenkins_gerrit_url}/mk/heat-templates"
+ STACK_TEMPLATE_CREDENTIALS:
+ type: string
+ default: "gerrit"
+ STACK_TEMPLATE_BRANCH:
+ type: string
+ default: "master"
+
+ # salt
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ default: "salt-qa-credentials"
+ SALT_MASTER_URL:
+ type: string
+ default: ""
+
+ # aws api
+ AWS_STACK_REGION:
+ type: string
+ default: "eu-central-1"
+ AWS_API_CREDENTIALS:
+ type: string
+ default: "aws-credentials"
+ AWS_SSH_KEY:
+ type: string
+ default: "jenkins-mk"
+ KQUEEN_BUILD_ID:
+ type: string
+
diff --git a/jenkins/client/job/docker/opencontrail.yml b/jenkins/client/job/docker/opencontrail.yml
index 53a76e0..b5052de 100644
--- a/jenkins/client/job/docker/opencontrail.yml
+++ b/jenkins/client/job/docker/opencontrail.yml
@@ -6,6 +6,7 @@
name: "docker-build-images-opencontrail-{{version}}"
jobs:
- version: oc40
+ - version: oc41
template:
discard:
build:
@@ -30,6 +31,9 @@
comment:
- addedContains:
commentAddedCommentContains: '(buildcontainer|test|recheck|verify|)'
+ reverse:
+ projects:
+ - build-opencontrail-{{version}}-ubuntu-xenial
param:
IMAGE_GIT_URL:
type: string
diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index c022c28..a4debd4 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -548,8 +548,174 @@
APTLY_API_URL:
type: string
description: URL for the aptly API
- default: "${_param:jenkins_aptly_url}"
+ default: "${_param:jenkins_aptly_api_url}"
STACK_DELETE:
type: boolean
default: "{{stack_delete}}"
description: Do not enable it if you need to use the lab after
+ OPENSTACK_COMPONENTS_LIST:
+ type: string
+ description: "OpenStack related components list"
+ default: "{{openstack_components_list}}"
+ build-salt-formula-refspec-template:
+ name: "{{job_prefix}}-build-salt-formula-refspec"
+ template:
+ discard:
+ build:
+ keep_num: 30
+ artifact:
+ keep_num: 30
+ type: workflow-scm
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines.git"
+ credentials: "gerrit"
+ branch: 'master'
+ script: build-debian-packages-pipeline.groovy
+ param:
+ SOURCE_URL:
+ type: string
+ default: ""
+ description: Project Git repo URL
+ SOURCE_REFSPEC:
+ type: string
+ default: ""
+ description: Refspec to checkout
+ SOURCE_BRANCH:
+ type: string
+ default: "master"
+ description: Name of local branch name for checked out refspec
+ SOURCE_CREDENTIALS:
+ type: string
+ default: "gerrit"
+ description: Credentials to Git repo
+ DEBIAN_SNAPSHOT:
+ type: boolean
+ default: 'true'
+ description: Whether to make a snapshot build
+ EXTRA_REPO_URL:
+ type: string
+ default: "deb ${_param:jenkins_aptly_url}/{{dist}}/ testing salt salt-latest"
+ description: Extra repo for building process
+ EXTRA_REPO_KEY_URL:
+ type: string
+ default: "${_param:jenkins_aptly_url}/public.gpg"
+ description: Extra repo GPG public key URL
+ OS:
+ type: string
+ default: "ubuntu"
+ description: OS name
+ DIST:
+ type: string
+ default: "{{dist}}"
+ description: OS distributive name
+ UPLOAD_PPA:
+ type: boolean
+ default: 'false'
+ description: Whether to upload to PPA
+ UPLOAD_APTLY:
+ type: boolean
+ default: 'false'
+ description: Whether to upload to Aptly
+ DEBIAN_BRANCH:
+ type: string
+ default: "debian/{{dist}}"
+ description: Source repo branch name with build spec
+ LINTIAN_CHECK:
+ type: boolean
+ default: 'false'
+ description: Whether to perform lintian check
+ test-salt-formula-refspec-template:
+ name: "{{job_prefix}}-test-salt-formula-refspec"
+ template:
+ discard:
+ build:
+ keep_num: 30
+ artifact:
+ keep_num: 30
+ type: workflow-scm
+ concurrent: false
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/openstack-ci/openstack-pipelines.git"
+ credentials: "gerrit"
+ branch: 'master'
+ script: deploy-formula-change-pipeline.groovy
+ trigger:
+ gerrit:
+ project:
+ "^salt-formulas/(nova|cinder|glance|keystone|horizon|neutron|designate|heat|ironic|barbican)$":
+ compare_type: 'REG_EXP'
+ branches:
+ - master
+ skip_vote:
+ - successful
+ - failed
+ - unstable
+ - not_built
+ message:
+ build_successful: "Build successful"
+ build_unstable: "Build unstable"
+ build_failure: "Build failed"
+ event:
+ comment:
+ - addedContains:
+ commentAddedCommentContains: 'deploy'
+ patchset:
+ - created:
+ excludeDrafts: true
+ excludeTrivialRebase: true
+ excludeNoCodeChange: true
+ param:
+ SOURCE_CREDENTIALS:
+ type: string
+ default: "gerrit"
+ UPLOAD_APTLY:
+ type: boolean
+ default: 'true'
+ description: Whether to upload to Aptly
+ APTLY_REPO:
+ type: string
+ default: ""
+ description: Aptly repo name
+ BUILD_PACKAGE:
+ type: boolean
+ default: 'true'
+ description: Whether to build package
+ APTLY_REPO_URL:
+ type: string
+ default: "${_param:jenkins_aptly_url}"
+ description: Aptly url
+ APTLY_API_URL:
+ type: string
+ default: "${_param:jenkins_aptly_api_url}"
+ description: Aptly API url
+ OPENSTACK_RELEASES:
+ type: string
+ default: "{{openstack_releases}}"
+ description: Comma separated list of OpenStack releases to perform deploy and tests.
+ SOURCES:
+ type: text
+ default: ""
+ description: Optional parameter to list Git refspecs to be build
+ STACK_RECLASS_ADDRESS:
+ type: string
+ default: "{{stack_reclass_address}}"
+ description: Git repo URL to reclass
+ PKG_BUILD_JOB_NAME:
+ type: string
+ default: "{{pkg_build_job_name}}"
+ description: Jenkins job name to build package
+ STACK_DELETE:
+ type: boolean
+ default: 'true'
+ description: Whether to delete stacks ater tests
+ APTLY_PREFIX:
+ type: string
+ default: "{{aptly_prefix}}"
+ description: Aptly prefix
+ SYSTEST_JOB_PREFIX:
+ type: string
+ default: "{{systestJobPrefix}}"
+ description: "Systest job prefix. I.e. oscore-formula-systest-virtual_mcp11_aio-"