Merge "Add terraform to docker CI executor images."
authorPeter Mikus <pmikus@cisco.com>
Tue, 24 Aug 2021 09:13:14 +0000 (09:13 +0000)
committerGerrit Code Review <gerrit@fd.io>
Tue, 24 Aug 2021 09:13:14 +0000 (09:13 +0000)
95 files changed:
docker/LICENSE
global-jjb
jenkins-config/managed-config-files/custom/.packagecloud/config-params.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/custom/.packagecloud/content [new file with mode: 0644]
jenkins-config/managed-config-files/custom/.packagecloud/customizedCredentialMappings.sandbox.yaml [new symlink]
jenkins-config/managed-config-files/custom/.packagecloud/customizedCredentialMappings.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/custom/clouds-yaml/config-params.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/custom/clouds-yaml/content [new file with mode: 0644]
jenkins-config/managed-config-files/custom/clouds-yaml/customizedCredentialMappings.sandbox.yaml [new symlink]
jenkins-config/managed-config-files/custom/clouds-yaml/customizedCredentialMappings.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/custom/jenkins-s3-docs-ship/config-params.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/custom/jenkins-s3-docs-ship/content [new file with mode: 0644]
jenkins-config/managed-config-files/custom/jenkins-s3-docs-ship/customizedCredentialMappings.sandbox.yaml [new symlink]
jenkins-config/managed-config-files/custom/jenkins-s3-docs-ship/customizedCredentialMappings.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/custom/jenkins-s3-log-ship/config-params.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/custom/jenkins-s3-log-ship/content [new file with mode: 0644]
jenkins-config/managed-config-files/custom/jenkins-s3-log-ship/customizedCredentialMappings.sandbox.yaml [new symlink]
jenkins-config/managed-config-files/custom/jenkins-s3-log-ship/customizedCredentialMappings.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/custom/jjbini/config-params.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/custom/jjbini/content [new file with mode: 0644]
jenkins-config/managed-config-files/custom/jjbini/customizedCredentialMappings.sandbox.yaml [new symlink]
jenkins-config/managed-config-files/custom/jjbini/customizedCredentialMappings.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/custom/lftoolsini/config-params.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/custom/lftoolsini/content [new file with mode: 0644]
jenkins-config/managed-config-files/custom/lftoolsini/customizedCredentialMappings.sandbox.yaml [new symlink]
jenkins-config/managed-config-files/custom/lftoolsini/customizedCredentialMappings.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/custom/npmrc/config-params.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/custom/npmrc/content [new file with mode: 0644]
jenkins-config/managed-config-files/custom/packagecloud/config-params.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/custom/packagecloud/content [new file with mode: 0644]
jenkins-config/managed-config-files/custom/packagecloud/customizedCredentialMappings.sandbox.yaml [new symlink]
jenkins-config/managed-config-files/custom/packagecloud/customizedCredentialMappings.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/custom/packagecloud_api/config-params.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/custom/packagecloud_api/content [new file with mode: 0644]
jenkins-config/managed-config-files/custom/packagecloud_api/customizedCredentialMappings.sandbox.yaml [new symlink]
jenkins-config/managed-config-files/custom/packagecloud_api/customizedCredentialMappings.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/custom/packer-cloud-env/config-params.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/custom/packer-cloud-env/content [new file with mode: 0644]
jenkins-config/managed-config-files/custom/packer-cloud-env/customizedCredentialMappings.sandbox.yaml [new symlink]
jenkins-config/managed-config-files/custom/packer-cloud-env/customizedCredentialMappings.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/custom/pipconf/config-params.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/custom/pipconf/content [new file with mode: 0644]
jenkins-config/managed-config-files/custom/sigul-config/config-params.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/custom/sigul-config/content [new file with mode: 0644]
jenkins-config/managed-config-files/custom/sigul-config/customizedCredentialMappings.sandbox.yaml [new symlink]
jenkins-config/managed-config-files/custom/sigul-config/customizedCredentialMappings.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/custom/sigul-password/config-params.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/custom/sigul-password/content [new file with mode: 0644]
jenkins-config/managed-config-files/custom/sigul-password/customizedCredentialMappings.sandbox.yaml [new symlink]
jenkins-config/managed-config-files/custom/sigul-password/customizedCredentialMappings.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/globalMavenSettings/global-settings/config-params.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/globalMavenSettings/global-settings/content [new file with mode: 0644]
jenkins-config/managed-config-files/mavenSettings/cicn-settings/config-params.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/mavenSettings/cicn-settings/content [new symlink]
jenkins-config/managed-config-files/mavenSettings/cicn-settings/serverCredentialMappings.sandbox.yaml [new symlink]
jenkins-config/managed-config-files/mavenSettings/cicn-settings/serverCredentialMappings.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/mavenSettings/csit-settings/config-params.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/mavenSettings/csit-settings/content [new symlink]
jenkins-config/managed-config-files/mavenSettings/csit-settings/serverCredentialMappings.sandbox.yaml [new symlink]
jenkins-config/managed-config-files/mavenSettings/csit-settings/serverCredentialMappings.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/mavenSettings/hc2vpp-settings/config-params.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/mavenSettings/hc2vpp-settings/content [new symlink]
jenkins-config/managed-config-files/mavenSettings/hc2vpp-settings/serverCredentialMappings.sandbox.yaml [new symlink]
jenkins-config/managed-config-files/mavenSettings/hc2vpp-settings/serverCredentialMappings.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/mavenSettings/hicn-settings/config-params.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/mavenSettings/hicn-settings/content [new symlink]
jenkins-config/managed-config-files/mavenSettings/hicn-settings/serverCredentialMappings.sandbox.yaml [new symlink]
jenkins-config/managed-config-files/mavenSettings/hicn-settings/serverCredentialMappings.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/mavenSettings/jenkins-log-archives-settings/config-params.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/mavenSettings/jenkins-log-archives-settings/content [new symlink]
jenkins-config/managed-config-files/mavenSettings/jenkins-log-archives-settings/serverCredentialMappings.sandbox.yaml [new symlink]
jenkins-config/managed-config-files/mavenSettings/jenkins-log-archives-settings/serverCredentialMappings.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/mavenSettings/udpi-settings/config-params.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/mavenSettings/udpi-settings/content [new symlink]
jenkins-config/managed-config-files/mavenSettings/udpi-settings/serverCredentialMappings.sandbox.yaml [new symlink]
jenkins-config/managed-config-files/mavenSettings/udpi-settings/serverCredentialMappings.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/mavenSettings/vpp-settings/config-params.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/mavenSettings/vpp-settings/content [new symlink]
jenkins-config/managed-config-files/mavenSettings/vpp-settings/serverCredentialMappings.sandbox.yaml [new symlink]
jenkins-config/managed-config-files/mavenSettings/vpp-settings/serverCredentialMappings.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/openstackUserData/jenkins-init-system/config-params.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/openstackUserData/jenkins-init-system/content [new file with mode: 0644]
jenkins-config/managed-config-templates/mavenSettings-content [new file with mode: 0644]
jenkins-config/managed-config-templates/serverCredentialMappings.sandbox.yaml [new file with mode: 0644]
jjb/csit/csit.yaml
jjb/global-macros.yaml
jjb/scripts/csit/docs.sh
jjb/scripts/csit/report.sh
jjb/scripts/csit/trending.sh [new file with mode: 0644]
jjb/scripts/publish_docs.sh [new file with mode: 0644]
jjb/scripts/publish_library_py.sh [moved from jjb/scripts/logs_publish.sh with 86% similarity]
jjb/scripts/publish_logs.sh [new file with mode: 0644]
jjb/udpi/udpi.yaml
jjb/vpp/vpp.yaml
jjb/vsap/vsap.yaml

index 20f96ba..e2c1e1a 100644 (file)
@@ -1,35 +1,3 @@
------------
-MIT License
-
-Copyright (c) 2019 snergfdio
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
------------
-
-The above MIT license applies to all files and their contents at the time
-they were copied from
-     https://github.com/snergfdio/csit-shim
-     https://github.com/snergfdio/csit-sut
-
-All subsequent changes to the files and/or contents shall be subject to
-the Apache license below:
-
 -----------
                                  Apache License
                            Version 2.0, January 2004
index 7f064ed..28c0687 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 7f064ed20dd2fdf8ed25976b840afa250023e657
+Subproject commit 28c06872f86a6d432e89ab4923bb807145e3aefc
diff --git a/jenkins-config/managed-config-files/custom/.packagecloud/config-params.yaml b/jenkins-config/managed-config-files/custom/.packagecloud/config-params.yaml
new file mode 100644 (file)
index 0000000..b4f21a7
--- /dev/null
@@ -0,0 +1,3 @@
+---
+name: "packagecloud"
+comment: "packagecloud"
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/.packagecloud/content b/jenkins-config/managed-config-files/custom/.packagecloud/content
new file mode 100644 (file)
index 0000000..4c0f100
--- /dev/null
@@ -0,0 +1,4 @@
+{
+  "url":"https://packagecloud.io",
+  "token":"$PACKAGECLOUD_TOKEN"
+}
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/.packagecloud/customizedCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/custom/.packagecloud/customizedCredentialMappings.sandbox.yaml
new file mode 120000 (symlink)
index 0000000..ba50257
--- /dev/null
@@ -0,0 +1 @@
+customizedCredentialMappings.yaml
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/.packagecloud/customizedCredentialMappings.yaml b/jenkins-config/managed-config-files/custom/.packagecloud/customizedCredentialMappings.yaml
new file mode 100644 (file)
index 0000000..538365e
--- /dev/null
@@ -0,0 +1,4 @@
+---
+customizedCredentialMappings:
+  - credentialsId: "packagecloud_token"
+    tokenKey: "PACKAGECLOUD_TOKEN"
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/clouds-yaml/config-params.yaml b/jenkins-config/managed-config-files/custom/clouds-yaml/config-params.yaml
new file mode 100644 (file)
index 0000000..c7f2a93
--- /dev/null
@@ -0,0 +1,3 @@
+---
+name: "clouds-yaml"
+comment: "clouds-yaml"
diff --git a/jenkins-config/managed-config-files/custom/clouds-yaml/content b/jenkins-config/managed-config-files/custom/clouds-yaml/content
new file mode 100644 (file)
index 0000000..4c6d9b9
--- /dev/null
@@ -0,0 +1,10 @@
+clouds:
+  vexci:
+    auth:
+      username: "$VEXCI_CLOUD_CREDENTIAL_USR"
+      project_name: "9130c79d-75b8-466e-8e57-4eccce50e28e"
+      password: "$VEXCI_CLOUD_CREDENTIAL_PSW"
+      auth_url: 'https://auth.vexxhost.net/v3/'
+      user_domain_name: Default
+      project_domain_name: Default
+    region_name: ca-ymq-1
diff --git a/jenkins-config/managed-config-files/custom/clouds-yaml/customizedCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/custom/clouds-yaml/customizedCredentialMappings.sandbox.yaml
new file mode 120000 (symlink)
index 0000000..ba50257
--- /dev/null
@@ -0,0 +1 @@
+customizedCredentialMappings.yaml
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/clouds-yaml/customizedCredentialMappings.yaml b/jenkins-config/managed-config-files/custom/clouds-yaml/customizedCredentialMappings.yaml
new file mode 100644 (file)
index 0000000..2dce070
--- /dev/null
@@ -0,0 +1,4 @@
+---
+customizedCredentialMappings:
+  - credentialsId: "vexci_cloud_credential"
+    tokenKey: "VEXCI_CLOUD_CREDENTIAL"
diff --git a/jenkins-config/managed-config-files/custom/jenkins-s3-docs-ship/config-params.yaml b/jenkins-config/managed-config-files/custom/jenkins-s3-docs-ship/config-params.yaml
new file mode 100644 (file)
index 0000000..b49817b
--- /dev/null
@@ -0,0 +1,3 @@
+---
+name: "jenkins-s3-docs-ship"
+comment: "jenkins-s3-docs-ship"
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/jenkins-s3-docs-ship/content b/jenkins-config/managed-config-files/custom/jenkins-s3-docs-ship/content
new file mode 100644 (file)
index 0000000..9ba807e
--- /dev/null
@@ -0,0 +1,4 @@
+[default]
+aws_access_key_id = $JENKINS_S3_DOCS_SHIP_USR
+aws_secret_access_key = $JENKINS_S3_DOCS_SHIP_PSW
+region = us-east-1
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/jenkins-s3-docs-ship/customizedCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/custom/jenkins-s3-docs-ship/customizedCredentialMappings.sandbox.yaml
new file mode 120000 (symlink)
index 0000000..ba50257
--- /dev/null
@@ -0,0 +1 @@
+customizedCredentialMappings.yaml
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/jenkins-s3-docs-ship/customizedCredentialMappings.yaml b/jenkins-config/managed-config-files/custom/jenkins-s3-docs-ship/customizedCredentialMappings.yaml
new file mode 100644 (file)
index 0000000..5f886f8
--- /dev/null
@@ -0,0 +1,4 @@
+---
+customizedCredentialMappings:
+  - credentialsId: "jenkins-s3-docs-ship"
+    tokenKey: "JENKINS_S3_DOCS_SHIP"
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/jenkins-s3-log-ship/config-params.yaml b/jenkins-config/managed-config-files/custom/jenkins-s3-log-ship/config-params.yaml
new file mode 100644 (file)
index 0000000..11f4653
--- /dev/null
@@ -0,0 +1,3 @@
+---
+name: "jenkins-s3-log-ship"
+comment: "jenkins-s3-log-ship"
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/jenkins-s3-log-ship/content b/jenkins-config/managed-config-files/custom/jenkins-s3-log-ship/content
new file mode 100644 (file)
index 0000000..7787308
--- /dev/null
@@ -0,0 +1,4 @@
+[default]
+aws_access_key_id = $JENKINS_S3_LOG_SHIP_USR
+aws_secret_access_key = $JENKINS_S3_LOG_SHIP_PSW
+region = us-east-1
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/jenkins-s3-log-ship/customizedCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/custom/jenkins-s3-log-ship/customizedCredentialMappings.sandbox.yaml
new file mode 120000 (symlink)
index 0000000..ba50257
--- /dev/null
@@ -0,0 +1 @@
+customizedCredentialMappings.yaml
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/jenkins-s3-log-ship/customizedCredentialMappings.yaml b/jenkins-config/managed-config-files/custom/jenkins-s3-log-ship/customizedCredentialMappings.yaml
new file mode 100644 (file)
index 0000000..180a4f5
--- /dev/null
@@ -0,0 +1,4 @@
+---
+customizedCredentialMappings:
+  - credentialsId: "jenkins-s3-log-ship"
+    tokenKey: "JENKINS_S3_LOG_SHIP"
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/jjbini/config-params.yaml b/jenkins-config/managed-config-files/custom/jjbini/config-params.yaml
new file mode 100644 (file)
index 0000000..10e6e12
--- /dev/null
@@ -0,0 +1,3 @@
+---
+name: "jjbini"
+comment: "JJB Config"
diff --git a/jenkins-config/managed-config-files/custom/jjbini/content b/jenkins-config/managed-config-files/custom/jjbini/content
new file mode 100644 (file)
index 0000000..c5484e4
--- /dev/null
@@ -0,0 +1,24 @@
+[job_builder]
+ignore_cache=True
+keep_descriptions=False
+include_path=.:scripts:~/git/
+recursive=True
+
+[jenkins]
+user=$JOBBUILDER_PROD_USR
+password=$JOBBUILDER_PROD_PSW
+url=https://jenkins.fd.io
+query_plugins_info=True
+
+[production]
+user=$JOBBUILDER_PROD_USR
+password=$JOBBUILDER_PROD_PSW
+url=https://jenkins.fd.io
+query_plugins_info=True
+
+[sandbox]
+user=$JOBBUILDER_SANDBOX_USR
+password=$JOBBUILDER_SANDBOX_PSW
+url=https://jenkins.fd.io/sandbox
+query_plugins_info=True
+
diff --git a/jenkins-config/managed-config-files/custom/jjbini/customizedCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/custom/jjbini/customizedCredentialMappings.sandbox.yaml
new file mode 120000 (symlink)
index 0000000..ba50257
--- /dev/null
@@ -0,0 +1 @@
+customizedCredentialMappings.yaml
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/jjbini/customizedCredentialMappings.yaml b/jenkins-config/managed-config-files/custom/jjbini/customizedCredentialMappings.yaml
new file mode 100644 (file)
index 0000000..cb9cdaf
--- /dev/null
@@ -0,0 +1,6 @@
+---
+customizedCredentialMappings:
+  - credentialsId: "jobbuilder-prod"
+    tokenKey: "JOBBUILDER_PROD"
+  - credentialsId: "jobbuilder-sandbox"
+    tokenKey: "JOBBUILDER_SANDBOX"
diff --git a/jenkins-config/managed-config-files/custom/lftoolsini/config-params.yaml b/jenkins-config/managed-config-files/custom/lftoolsini/config-params.yaml
new file mode 100644 (file)
index 0000000..79955c5
--- /dev/null
@@ -0,0 +1,3 @@
+---
+name: "lftoolsini"
+comment: "lftoolsini"
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/lftoolsini/content b/jenkins-config/managed-config-files/custom/lftoolsini/content
new file mode 100644 (file)
index 0000000..b06ad22
--- /dev/null
@@ -0,0 +1,3 @@
+[nexus.opendaylight.org]
+username=$JENKINS_RELEASE_USR
+password=$JENKINS_RELEASE_PSW
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/lftoolsini/customizedCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/custom/lftoolsini/customizedCredentialMappings.sandbox.yaml
new file mode 120000 (symlink)
index 0000000..ba50257
--- /dev/null
@@ -0,0 +1 @@
+customizedCredentialMappings.yaml
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/lftoolsini/customizedCredentialMappings.yaml b/jenkins-config/managed-config-files/custom/lftoolsini/customizedCredentialMappings.yaml
new file mode 100644 (file)
index 0000000..6fd42c9
--- /dev/null
@@ -0,0 +1,4 @@
+---
+customizedCredentialMappings:
+  - credentialsId: "jenkins-release"
+    tokenKey: "JENKINS_RELEASE"
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/npmrc/config-params.yaml b/jenkins-config/managed-config-files/custom/npmrc/config-params.yaml
new file mode 100644 (file)
index 0000000..b0f66d1
--- /dev/null
@@ -0,0 +1,3 @@
+---
+name: "npmrc"
+comment: "npmrc"
diff --git a/jenkins-config/managed-config-files/custom/npmrc/content b/jenkins-config/managed-config-files/custom/npmrc/content
new file mode 100644 (file)
index 0000000..8b13789
--- /dev/null
@@ -0,0 +1 @@
+
diff --git a/jenkins-config/managed-config-files/custom/packagecloud/config-params.yaml b/jenkins-config/managed-config-files/custom/packagecloud/config-params.yaml
new file mode 100644 (file)
index 0000000..b4f21a7
--- /dev/null
@@ -0,0 +1,3 @@
+---
+name: "packagecloud"
+comment: "packagecloud"
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/packagecloud/content b/jenkins-config/managed-config-files/custom/packagecloud/content
new file mode 100644 (file)
index 0000000..4c0f100
--- /dev/null
@@ -0,0 +1,4 @@
+{
+  "url":"https://packagecloud.io",
+  "token":"$PACKAGECLOUD_TOKEN"
+}
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/packagecloud/customizedCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/custom/packagecloud/customizedCredentialMappings.sandbox.yaml
new file mode 120000 (symlink)
index 0000000..ba50257
--- /dev/null
@@ -0,0 +1 @@
+customizedCredentialMappings.yaml
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/packagecloud/customizedCredentialMappings.yaml b/jenkins-config/managed-config-files/custom/packagecloud/customizedCredentialMappings.yaml
new file mode 100644 (file)
index 0000000..538365e
--- /dev/null
@@ -0,0 +1,4 @@
+---
+customizedCredentialMappings:
+  - credentialsId: "packagecloud_token"
+    tokenKey: "PACKAGECLOUD_TOKEN"
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/packagecloud_api/config-params.yaml b/jenkins-config/managed-config-files/custom/packagecloud_api/config-params.yaml
new file mode 100644 (file)
index 0000000..39d5762
--- /dev/null
@@ -0,0 +1,3 @@
+---
+name: "packagecloud_api"
+comment: "packagecloud_api"
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/packagecloud_api/content b/jenkins-config/managed-config-files/custom/packagecloud_api/content
new file mode 100644 (file)
index 0000000..e6a4d1f
--- /dev/null
@@ -0,0 +1,3 @@
+machine packagecloud.io
+login $PACKAGECLOUD_API_LOGIN
+password
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/packagecloud_api/customizedCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/custom/packagecloud_api/customizedCredentialMappings.sandbox.yaml
new file mode 120000 (symlink)
index 0000000..ba50257
--- /dev/null
@@ -0,0 +1 @@
+customizedCredentialMappings.yaml
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/packagecloud_api/customizedCredentialMappings.yaml b/jenkins-config/managed-config-files/custom/packagecloud_api/customizedCredentialMappings.yaml
new file mode 100644 (file)
index 0000000..c9f2b1d
--- /dev/null
@@ -0,0 +1,4 @@
+---
+customizedCredentialMappings:
+  - credentialsId: "packagecloud_api_login"
+    tokenKey: "PACKAGECLOUD_API_LOGIN"
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/packer-cloud-env/config-params.yaml b/jenkins-config/managed-config-files/custom/packer-cloud-env/config-params.yaml
new file mode 100644 (file)
index 0000000..b942b13
--- /dev/null
@@ -0,0 +1,3 @@
+---
+name: "packer-cloud-env"
+comment: "packer-cloud-env"
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/packer-cloud-env/content b/jenkins-config/managed-config-files/custom/packer-cloud-env/content
new file mode 100644 (file)
index 0000000..2e8419a
--- /dev/null
@@ -0,0 +1,12 @@
+{
+  "cloud_auth_url": "https://auth.vexxhost.net/v3/",
+  "cloud_tenant": "ea2ff219-b01b-4ed7-974b-b241dceef107",
+  "stack_tenant": "ea2ff219-b01b-4ed7-974b-b241dceef107",
+  "cloud_user": "$PACKER_CLOUD_USER_USR",
+  "stack_user": "$PACKER_CLOUD_USER_USR",
+  "cloud_pass": "$PACKER_CLOUD_USER_PSW",
+  "stack_pass": "$PACKER_CLOUD_USER_PSW",
+  "cloud_network": "bcb9a62c-5a82-4293-a8c6-d73e8c2dbd03",
+  "stack_network": "bcb9a62c-5a82-4293-a8c6-d73e8c2dbd03",
+  "ssh_proxy_host": ""
+}
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/packer-cloud-env/customizedCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/custom/packer-cloud-env/customizedCredentialMappings.sandbox.yaml
new file mode 120000 (symlink)
index 0000000..ba50257
--- /dev/null
@@ -0,0 +1 @@
+customizedCredentialMappings.yaml
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/packer-cloud-env/customizedCredentialMappings.yaml b/jenkins-config/managed-config-files/custom/packer-cloud-env/customizedCredentialMappings.yaml
new file mode 100644 (file)
index 0000000..6bd8bbb
--- /dev/null
@@ -0,0 +1,4 @@
+---
+customizedCredentialMappings:
+  - credentialsId: "packer-cloud-user"
+    tokenKey: "PACKER_CLOUD_USER"
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/pipconf/config-params.yaml b/jenkins-config/managed-config-files/custom/pipconf/config-params.yaml
new file mode 100644 (file)
index 0000000..39c71ff
--- /dev/null
@@ -0,0 +1,3 @@
+---
+name: "pipconf"
+comment: "pipconf"
diff --git a/jenkins-config/managed-config-files/custom/pipconf/content b/jenkins-config/managed-config-files/custom/pipconf/content
new file mode 100644 (file)
index 0000000..8b13789
--- /dev/null
@@ -0,0 +1 @@
+
diff --git a/jenkins-config/managed-config-files/custom/sigul-config/config-params.yaml b/jenkins-config/managed-config-files/custom/sigul-config/config-params.yaml
new file mode 100644 (file)
index 0000000..fa28217
--- /dev/null
@@ -0,0 +1,3 @@
+---
+name: "sigul-config"
+comment: "sigul-config"
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/sigul-config/content b/jenkins-config/managed-config-files/custom/sigul-config/content
new file mode 100644 (file)
index 0000000..aad7737
--- /dev/null
@@ -0,0 +1,14 @@
+[client]
+bridge-hostname: vex-yul-rot-ingress-1.ci.codeaurora.org
+bridge-port: 44334
+client-cert-nickname: $SIGUL_CONFIG_USR
+server-hostname: pdx-wl-sigul-server-1.int.codeaurora.org
+user-name: $SIGUL_CONFIG_USR
+
+[koji]
+
+[nss]
+nss-dir: /home/jenkins/sigul
+nss-password: $SIGUL_CONFIG_PSW
+nss-min-tls: tls1.2
+nss-max-tls: tls1.2
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/sigul-config/customizedCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/custom/sigul-config/customizedCredentialMappings.sandbox.yaml
new file mode 120000 (symlink)
index 0000000..ba50257
--- /dev/null
@@ -0,0 +1 @@
+customizedCredentialMappings.yaml
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/sigul-config/customizedCredentialMappings.yaml b/jenkins-config/managed-config-files/custom/sigul-config/customizedCredentialMappings.yaml
new file mode 100644 (file)
index 0000000..932d49a
--- /dev/null
@@ -0,0 +1,4 @@
+---
+customizedCredentialMappings:
+  - credentialsId: "sigul-config"
+    tokenKey: "SIGUL_CONFIG"
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/sigul-password/config-params.yaml b/jenkins-config/managed-config-files/custom/sigul-password/config-params.yaml
new file mode 100644 (file)
index 0000000..c5dd08f
--- /dev/null
@@ -0,0 +1,3 @@
+---
+name: "sigul-password"
+comment: "sigul-password"
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/sigul-password/content b/jenkins-config/managed-config-files/custom/sigul-password/content
new file mode 100644 (file)
index 0000000..3857ffc
--- /dev/null
@@ -0,0 +1 @@
+$SIGUL_PASS
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/sigul-password/customizedCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/custom/sigul-password/customizedCredentialMappings.sandbox.yaml
new file mode 120000 (symlink)
index 0000000..ba50257
--- /dev/null
@@ -0,0 +1 @@
+customizedCredentialMappings.yaml
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/custom/sigul-password/customizedCredentialMappings.yaml b/jenkins-config/managed-config-files/custom/sigul-password/customizedCredentialMappings.yaml
new file mode 100644 (file)
index 0000000..e2e271e
--- /dev/null
@@ -0,0 +1,4 @@
+---
+customizedCredentialMappings:
+  - credentialsId: "sigul-pass"
+    tokenKey: "SIGUL_PASS"
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/globalMavenSettings/global-settings/config-params.yaml b/jenkins-config/managed-config-files/globalMavenSettings/global-settings/config-params.yaml
new file mode 100644 (file)
index 0000000..cf85503
--- /dev/null
@@ -0,0 +1,3 @@
+---
+name: "global-settings"
+comment: "Maven Global Settings file"
diff --git a/jenkins-config/managed-config-files/globalMavenSettings/global-settings/content b/jenkins-config/managed-config-files/globalMavenSettings/global-settings/content
new file mode 100644 (file)
index 0000000..d4b5ce2
--- /dev/null
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+
+  <mirrors>
+    <mirror>
+      <id>rotterdam-release-mirror</id>
+      <name>Local Nexus mirror for rotteram builds</name>
+      <url>${env.NEXUSPROXY}/content/repositories/public/</url>
+      <mirrorOf>central</mirrorOf>
+    </mirror>
+    <mirror>
+      <id>fd-release-mirror</id>
+      <name>Local Nexus mirror for fd.io builds</name>
+      <url>${env.NEXUSPROXY}/content/repositories/public/</url>
+      <mirrorOf>central</mirrorOf>
+    </mirror>
+  </mirrors>
+
+  <profiles>
+    <profile>
+      <id>rotterdam-release</id>
+      <repositories>
+        <repository>
+          <id>rotterdam-mirror</id>
+          <name>rotterdam-mirror</name>
+          <url>${env.NEXUSPROXY}/content/repositories/public/</url>
+          <releases>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+
+      <pluginRepositories>
+        <pluginRepository>
+          <id>rotterdam-mirror</id>
+          <name>rotterdam-mirror</name>
+          <url>${env.NEXUSPROXY}/content/repositories/public/</url>
+          <releases>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+
+    <profile>
+      <id>rotterdam-snapshot</id>
+      <repositories>
+        <repository>
+          <id>rotterdam-snapshot</id>
+          <name>rotterdam-snapshot</name>
+          <url>${env.NEXUSPROXY}/content/repositories/rotterdam.snapshot/</url>
+          <releases>
+            <enabled>false</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+
+      <pluginRepositories>
+        <pluginRepository>
+          <id>rotterdam-snapshot</id>
+          <name>rotterdamn-snapshot</name>
+          <url>${env.NEXUSPROXY}/content/repositories/rotterdam.snapshot/</url>
+          <releases>
+            <enabled>false</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+
+    <profile>
+      <id>fdio-release</id>
+      <repositories>
+        <repository>
+          <id>fdio-mirror</id>
+          <name>fdio-mirror</name>
+          <url>${env.NEXUSPROXY}/content/repositories/public/</url>
+          <releases>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+
+      <pluginRepositories>
+        <pluginRepository>
+          <id>fdio-mirror</id>
+          <name>fdio-mirror</name>
+          <url>${env.NEXUSPROXY}/content/repositories/public/</url>
+          <releases>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+
+    <profile>
+      <id>fdio-snapshot</id>
+      <repositories>
+        <repository>
+          <id>fdio-snapshot</id>
+          <name>fdio-snapshot</name>
+          <url>${env.NEXUSPROXY}/content/repositories/fd.io.snapshot/</url>
+          <releases>
+            <enabled>false</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+
+  <profile>
+      <id>staging</id>
+      <repositories>
+        <repository>
+          <id>staging</id>
+          <name>staging</name>
+          <url>${env.NEXUSPROXY}/content/repositories/staging/</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+    </profile>
+
+      <pluginRepositories>
+        <pluginRepository>
+          <id>fdio-snapshot</id>
+          <name>fdio-snapshot</name>
+          <url>${env.NEXUSPROXY}/content/repositories/fd.io.snapshot/</url>
+          <releases>
+            <enabled>false</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+
+  <profile>
+      <id>site</id>
+      <repositories>
+        <repository>
+          <id>site</id>
+          <name>site</name>
+          <url>${env.NEXUSPROXY}/content/repositories/site/</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+    </profile>
+
+  </profiles>
+
+  <activeProfiles>
+    <activeProfile>rotterdam-release</activeProfile>
+    <activeProfile>rotterdam-snapshot</activeProfile>
+    <activeProfile>fdio-release</activeProfile>
+    <activeProfile>fdio-snapshot</activeProfile>
+    <activeProfile>staging</activeProfile>
+    <activeProfile>site</activeProfile>
+  </activeProfiles>
+</settings>
diff --git a/jenkins-config/managed-config-files/mavenSettings/cicn-settings/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/cicn-settings/config-params.yaml
new file mode 100644 (file)
index 0000000..2f12e14
--- /dev/null
@@ -0,0 +1,3 @@
+---
+name: "cicn-settings"
+comment: "cicn-settings"
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/cicn-settings/content b/jenkins-config/managed-config-files/mavenSettings/cicn-settings/content
new file mode 120000 (symlink)
index 0000000..e830ebd
--- /dev/null
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-content
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/cicn-settings/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/cicn-settings/serverCredentialMappings.sandbox.yaml
new file mode 120000 (symlink)
index 0000000..d7baae2
--- /dev/null
@@ -0,0 +1 @@
+../../../managed-config-templates/serverCredentialMappings.sandbox.yaml
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/cicn-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/cicn-settings/serverCredentialMappings.yaml
new file mode 100644 (file)
index 0000000..3b6f793
--- /dev/null
@@ -0,0 +1,34 @@
+---
+serverCredentialMappings:
+  - serverId: "fdio-dev"
+    credentialsId: "cicn"
+  - serverId: "fdio-snapshot"
+    credentialsId: "cicn"
+  - serverId: "fdio-site"
+    credentialsId: "cicn"
+  - serverId: "fdio-release"
+    credentialsId: "cicn"
+  - serverId: "fdio-yum"
+    credentialsId: "cicn"
+  - serverId: "fd.io.master.centos7"
+    credentialsId: "cicn"
+  - serverId: "fd.io.master.ubuntu.trusty.main"
+    credentialsId: "cicn"
+  - serverId: "fd.io.master.ubuntu.xenial.main"
+    credentialsId: "cicn"
+  - serverId: "fd.io.master.ubuntu.bionic.main"
+    credentialsId: "cicn"
+  - serverId: "fd.io.master.ubuntu-arm.xenial.main"
+    credentialsId: "cicn"
+  - serverId: "fd.io.master.ubunto-arm.bionic.main"
+    credentialsId: "cicn"
+  - serverId: "fd.io.centos7"
+    credentialsId: "cicn"
+  - serverId: "fd.io.ubuntu.trust.main"
+    credentialsId: "cicn"
+  - serverId: "fd.io.ubuntu.xenial.main"
+    credentialsId: "cicn"
+  - serverId: "fd.io.ubuntu.bionic.main"
+    credentialsId: "cicn"
+  - serverId: "fd.io.ubuntu-arm.xenial.main"
+    credentialsId: "cicn"
diff --git a/jenkins-config/managed-config-files/mavenSettings/csit-settings/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/csit-settings/config-params.yaml
new file mode 100644 (file)
index 0000000..22b377e
--- /dev/null
@@ -0,0 +1,3 @@
+---
+name: "csit-settings"
+comment: "csit-settings"
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/csit-settings/content b/jenkins-config/managed-config-files/mavenSettings/csit-settings/content
new file mode 120000 (symlink)
index 0000000..e830ebd
--- /dev/null
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-content
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/csit-settings/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/csit-settings/serverCredentialMappings.sandbox.yaml
new file mode 120000 (symlink)
index 0000000..d7baae2
--- /dev/null
@@ -0,0 +1 @@
+../../../managed-config-templates/serverCredentialMappings.sandbox.yaml
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/csit-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/csit-settings/serverCredentialMappings.yaml
new file mode 100644 (file)
index 0000000..16e83c5
--- /dev/null
@@ -0,0 +1,34 @@
+---
+serverCredentialMappings:
+  - serverId: "fdio-dev"
+    credentialsId: "csit"
+  - serverId: "fdio-snapshot"
+    credentialsId: "csit"
+  - serverId: "fdio-site"
+    credentialsId: "csit"
+  - serverId: "fdio-release"
+    credentialsId: "csit"
+  - serverId: "fdio-yum"
+    credentialsId: "csit"
+  - serverId: "fd.io.master.centos7"
+    credentialsId: "csit"
+  - serverId: "fd.io.master.ubuntu.trusty.main"
+    credentialsId: "csit"
+  - serverId: "fd.io.master.ubuntu.xenial.main"
+    credentialsId: "csit"
+  - serverId: "fd.io.master.ubuntu.bionic.main"
+    credentialsId: "csit"
+  - serverId: "fd.io.master.ubuntu-arm.xenial.main"
+    credentialsId: "csit"
+  - serverId: "fd.io.master.ubunto-arm.bionic.main"
+    credentialsId: "csit"
+  - serverId: "fd.io.centos7"
+    credentialsId: "csit"
+  - serverId: "fd.io.ubuntu.trust.main"
+    credentialsId: "csit"
+  - serverId: "fd.io.ubuntu.xenial.main"
+    credentialsId: "csit"
+  - serverId: "fd.io.ubuntu.bionic.main"
+    credentialsId: "csit"
+  - serverId: "fd.io.ubuntu-arm.xenial.main"
+    credentialsId: "csit"
diff --git a/jenkins-config/managed-config-files/mavenSettings/hc2vpp-settings/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/hc2vpp-settings/config-params.yaml
new file mode 100644 (file)
index 0000000..fa03d32
--- /dev/null
@@ -0,0 +1,3 @@
+---
+name: "hc2vpp-settings"
+comment: "hc2vpp-settings"
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/hc2vpp-settings/content b/jenkins-config/managed-config-files/mavenSettings/hc2vpp-settings/content
new file mode 120000 (symlink)
index 0000000..e830ebd
--- /dev/null
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-content
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/hc2vpp-settings/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/hc2vpp-settings/serverCredentialMappings.sandbox.yaml
new file mode 120000 (symlink)
index 0000000..d7baae2
--- /dev/null
@@ -0,0 +1 @@
+../../../managed-config-templates/serverCredentialMappings.sandbox.yaml
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/hc2vpp-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/hc2vpp-settings/serverCredentialMappings.yaml
new file mode 100644 (file)
index 0000000..882a3a6
--- /dev/null
@@ -0,0 +1,34 @@
+---
+serverCredentialMappings:
+  - serverId: "fdio-dev"
+    credentialsId: "hc2vpp"
+  - serverId: "fdio-snapshot"
+    credentialsId: "hc2vpp"
+  - serverId: "fdio-site"
+    credentialsId: "hc2vpp"
+  - serverId: "fdio-release"
+    credentialsId: "hc2vpp"
+  - serverId: "fdio-yum"
+    credentialsId: "hc2vpp"
+  - serverId: "fd.io.master.centos7"
+    credentialsId: "hc2vpp"
+  - serverId: "fd.io.master.ubuntu.trusty.main"
+    credentialsId: "hc2vpp"
+  - serverId: "fd.io.master.ubuntu.xenial.main"
+    credentialsId: "hc2vpp"
+  - serverId: "fd.io.master.ubuntu.bionic.main"
+    credentialsId: "hc2vpp"
+  - serverId: "fd.io.master.ubuntu-arm.xenial.main"
+    credentialsId: "hc2vpp"
+  - serverId: "fd.io.master.ubunto-arm.bionic.main"
+    credentialsId: "hc2vpp"
+  - serverId: "fd.io.centos7"
+    credentialsId: "hc2vpp"
+  - serverId: "fd.io.ubuntu.trust.main"
+    credentialsId: "hc2vpp"
+  - serverId: "fd.io.ubuntu.xenial.main"
+    credentialsId: "hc2vpp"
+  - serverId: "fd.io.ubuntu.bionic.main"
+    credentialsId: "hc2vpp"
+  - serverId: "fd.io.ubuntu-arm.xenial.main"
+    credentialsId: "hc2vpp"
diff --git a/jenkins-config/managed-config-files/mavenSettings/hicn-settings/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/hicn-settings/config-params.yaml
new file mode 100644 (file)
index 0000000..d68c9f0
--- /dev/null
@@ -0,0 +1,3 @@
+---
+name: "hicn-settings"
+comment: "hicn-settings"
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/hicn-settings/content b/jenkins-config/managed-config-files/mavenSettings/hicn-settings/content
new file mode 120000 (symlink)
index 0000000..e830ebd
--- /dev/null
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-content
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/hicn-settings/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/hicn-settings/serverCredentialMappings.sandbox.yaml
new file mode 120000 (symlink)
index 0000000..d7baae2
--- /dev/null
@@ -0,0 +1 @@
+../../../managed-config-templates/serverCredentialMappings.sandbox.yaml
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/hicn-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/hicn-settings/serverCredentialMappings.yaml
new file mode 100644 (file)
index 0000000..85dffa3
--- /dev/null
@@ -0,0 +1,34 @@
+---
+serverCredentialMappings:
+  - serverId: "fdio-dev"
+    credentialsId: "hicn"
+  - serverId: "fdio-snapshot"
+    credentialsId: "hicn"
+  - serverId: "fdio-site"
+    credentialsId: "hicn"
+  - serverId: "fdio-release"
+    credentialsId: "hicn"
+  - serverId: "fdio-yum"
+    credentialsId: "hicn"
+  - serverId: "fd.io.master.centos7"
+    credentialsId: "hicn"
+  - serverId: "fd.io.master.ubuntu.trusty.main"
+    credentialsId: "hicn"
+  - serverId: "fd.io.master.ubuntu.xenial.main"
+    credentialsId: "hicn"
+  - serverId: "fd.io.master.ubuntu.bionic.main"
+    credentialsId: "hicn"
+  - serverId: "fd.io.master.ubuntu-arm.xenial.main"
+    credentialsId: "hicn"
+  - serverId: "fd.io.master.ubunto-arm.bionic.main"
+    credentialsId: "hicn"
+  - serverId: "fd.io.centos7"
+    credentialsId: "hicn"
+  - serverId: "fd.io.ubuntu.trust.main"
+    credentialsId: "hicn"
+  - serverId: "fd.io.ubuntu.xenial.main"
+    credentialsId: "hicn"
+  - serverId: "fd.io.ubuntu.bionic.main"
+    credentialsId: "hicn"
+  - serverId: "fd.io.ubuntu-arm.xenial.main"
+    credentialsId: "hicn"
diff --git a/jenkins-config/managed-config-files/mavenSettings/jenkins-log-archives-settings/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/jenkins-log-archives-settings/config-params.yaml
new file mode 100644 (file)
index 0000000..fcb8df0
--- /dev/null
@@ -0,0 +1,3 @@
+---
+name: "jenkins-log-archives-settings"
+comment: "jenkins-log-archives-settings"
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/jenkins-log-archives-settings/content b/jenkins-config/managed-config-files/mavenSettings/jenkins-log-archives-settings/content
new file mode 120000 (symlink)
index 0000000..e830ebd
--- /dev/null
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-content
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/jenkins-log-archives-settings/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/jenkins-log-archives-settings/serverCredentialMappings.sandbox.yaml
new file mode 120000 (symlink)
index 0000000..c94d071
--- /dev/null
@@ -0,0 +1 @@
+serverCredentialMappings.yaml
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/jenkins-log-archives-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/jenkins-log-archives-settings/serverCredentialMappings.yaml
new file mode 100644 (file)
index 0000000..2cf7569
--- /dev/null
@@ -0,0 +1,4 @@
+---
+serverCredentialMappings:
+  - serverId: "logs"
+    credentialsId: "jenkins-log-archives"
diff --git a/jenkins-config/managed-config-files/mavenSettings/udpi-settings/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/udpi-settings/config-params.yaml
new file mode 100644 (file)
index 0000000..5483916
--- /dev/null
@@ -0,0 +1,3 @@
+---
+name: "udpi-settings"
+comment: "udpi-settings"
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/udpi-settings/content b/jenkins-config/managed-config-files/mavenSettings/udpi-settings/content
new file mode 120000 (symlink)
index 0000000..e830ebd
--- /dev/null
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-content
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/udpi-settings/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/udpi-settings/serverCredentialMappings.sandbox.yaml
new file mode 120000 (symlink)
index 0000000..d7baae2
--- /dev/null
@@ -0,0 +1 @@
+../../../managed-config-templates/serverCredentialMappings.sandbox.yaml
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/udpi-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/udpi-settings/serverCredentialMappings.yaml
new file mode 100644 (file)
index 0000000..c11aa99
--- /dev/null
@@ -0,0 +1,34 @@
+---
+serverCredentialMappings:
+  - serverId: "fdio-dev"
+    credentialsId: "udpi"
+  - serverId: "fdio-snapshot"
+    credentialsId: "udpi"
+  - serverId: "fdio-site"
+    credentialsId: "udpi"
+  - serverId: "fdio-release"
+    credentialsId: "udpi"
+  - serverId: "fdio-yum"
+    credentialsId: "udpi"
+  - serverId: "fd.io.master.centos7"
+    credentialsId: "udpi"
+  - serverId: "fd.io.master.ubuntu.trusty.main"
+    credentialsId: "udpi"
+  - serverId: "fd.io.master.ubuntu.xenial.main"
+    credentialsId: "udpi"
+  - serverId: "fd.io.master.ubuntu.bionic.main"
+    credentialsId: "udpi"
+  - serverId: "fd.io.master.ubuntu-arm.xenial.main"
+    credentialsId: "udpi"
+  - serverId: "fd.io.master.ubunto-arm.bionic.main"
+    credentialsId: "udpi"
+  - serverId: "fd.io.centos7"
+    credentialsId: "udpi"
+  - serverId: "fd.io.ubuntu.trust.main"
+    credentialsId: "udpi"
+  - serverId: "fd.io.ubuntu.xenial.main"
+    credentialsId: "udpi"
+  - serverId: "fd.io.ubuntu.bionic.main"
+    credentialsId: "udpi"
+  - serverId: "fd.io.ubuntu-arm.xenial.main"
+    credentialsId: "udpi"
diff --git a/jenkins-config/managed-config-files/mavenSettings/vpp-settings/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/vpp-settings/config-params.yaml
new file mode 100644 (file)
index 0000000..9a18f02
--- /dev/null
@@ -0,0 +1,3 @@
+---
+name: "vpp-settings"
+comment: "vpp-settings"
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/vpp-settings/content b/jenkins-config/managed-config-files/mavenSettings/vpp-settings/content
new file mode 120000 (symlink)
index 0000000..e830ebd
--- /dev/null
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-content
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/vpp-settings/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/vpp-settings/serverCredentialMappings.sandbox.yaml
new file mode 120000 (symlink)
index 0000000..d7baae2
--- /dev/null
@@ -0,0 +1 @@
+../../../managed-config-templates/serverCredentialMappings.sandbox.yaml
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/vpp-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/vpp-settings/serverCredentialMappings.yaml
new file mode 100644 (file)
index 0000000..fab774c
--- /dev/null
@@ -0,0 +1,34 @@
+---
+serverCredentialMappings:
+  - serverId: "fdio-dev"
+    credentialsId: "vpp"
+  - serverId: "fdio-snapshot"
+    credentialsId: "vpp"
+  - serverId: "fdio-site"
+    credentialsId: "vpp"
+  - serverId: "fdio-release"
+    credentialsId: "vpp"
+  - serverId: "fdio-yum"
+    credentialsId: "vpp"
+  - serverId: "fd.io.master.centos7"
+    credentialsId: "vpp"
+  - serverId: "fd.io.master.ubuntu.trusty.main"
+    credentialsId: "vpp"
+  - serverId: "fd.io.master.ubuntu.xenial.main"
+    credentialsId: "vpp"
+  - serverId: "fd.io.master.ubuntu.bionic.main"
+    credentialsId: "vpp"
+  - serverId: "fd.io.master.ubuntu-arm.xenial.main"
+    credentialsId: "vpp"
+  - serverId: "fd.io.master.ubunto-arm.bionic.main"
+    credentialsId: "vpp"
+  - serverId: "fd.io.centos7"
+    credentialsId: "vpp"
+  - serverId: "fd.io.ubuntu.trust.main"
+    credentialsId: "vpp"
+  - serverId: "fd.io.ubuntu.xenial.main"
+    credentialsId: "vpp"
+  - serverId: "fd.io.ubuntu.bionic.main"
+    credentialsId: "vpp"
+  - serverId: "fd.io.ubuntu-arm.xenial.main"
+    credentialsId: "vpp"
diff --git a/jenkins-config/managed-config-files/openstackUserData/jenkins-init-system/config-params.yaml b/jenkins-config/managed-config-files/openstackUserData/jenkins-init-system/config-params.yaml
new file mode 100644 (file)
index 0000000..cff0337
--- /dev/null
@@ -0,0 +1,3 @@
+---
+name: "jenkins-init-system"
+comment: "Run ci-management/jenkins-scripts/init_system.sh"
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/openstackUserData/jenkins-init-system/content b/jenkins-config/managed-config-files/openstackUserData/jenkins-init-system/content
new file mode 100644 (file)
index 0000000..427d613
--- /dev/null
@@ -0,0 +1,8 @@
+#!/bin/bash
+until host github.com &>/dev/null
+do
+    echo "Waiting until github.com is resolvable..."
+done
+git clone https://github.com/lfit/releng-global-jjb.git /opt/ciman/global-jjb
+/opt/ciman/global-jjb/jenkins-init-scripts/init.sh
+rm -rf /opt/ciman/releng-global-jjb/
\ No newline at end of file
diff --git a/jenkins-config/managed-config-templates/mavenSettings-content b/jenkins-config/managed-config-templates/mavenSettings-content
new file mode 100644 (file)
index 0000000..ff6191e
--- /dev/null
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+</settings>
\ No newline at end of file
diff --git a/jenkins-config/managed-config-templates/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-templates/serverCredentialMappings.sandbox.yaml
new file mode 100644 (file)
index 0000000..a71b8fc
--- /dev/null
@@ -0,0 +1,34 @@
+---
+serverCredentialMappings:
+  - serverId: "fdio-dev"
+    credentialsId: "unused"
+  - serverId: "fdio-snapshot"
+    credentialsId: "unused"
+  - serverId: "fdio-site"
+    credentialsId: "unused"
+  - serverId: "fdio-release"
+    credentialsId: "unused"
+  - serverId: "fdio-yum"
+    credentialsId: "unused"
+  - serverId: "fd.io.master.centos7"
+    credentialsId: "unused"
+  - serverId: "fd.io.master.ubuntu.trusty.main"
+    credentialsId: "unused"
+  - serverId: "fd.io.master.ubuntu.xenial.main"
+    credentialsId: "unused"
+  - serverId: "fd.io.master.ubuntu.bionic.main"
+    credentialsId: "unused"
+  - serverId: "fd.io.master.ubuntu-arm.xenial.main"
+    credentialsId: "unused"
+  - serverId: "fd.io.master.ubunto-arm.bionic.main"
+    credentialsId: "unused"
+  - serverId: "fd.io.centos7"
+    credentialsId: "unused"
+  - serverId: "fd.io.ubuntu.trust.main"
+    credentialsId: "unused"
+  - serverId: "fd.io.ubuntu.xenial.main"
+    credentialsId: "unused"
+  - serverId: "fd.io.ubuntu.bionic.main"
+    credentialsId: "unused"
+  - serverId: "fd.io.ubuntu-arm.xenial.main"
+    credentialsId: "unused"
index a3ab6f4..f99cc6c 100644 (file)
@@ -19,8 +19,8 @@
     jobs:
       - 'csit-docs-merge-{stream}-{os}-{executor-arch}'
       - 'csit-report-merge-{stream}-{os}-{executor-arch}'
-      - 'csit-trending-daily-master-{os}-{executor-arch}'
-      - 'csit-trending-weekly-2009-lts-{os}-{executor-arch}'
+      - 'csit-trending-merge-daily-master-{os}-{executor-arch}'
+      - 'csit-trending-merge-weekly-2009-lts-{os}-{executor-arch}'
 
     project: 'csit'
     branch: 'master'
@@ -68,8 +68,6 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - maven-exec:
-          maven-version: 'mvn33-new'
 
     scm:
       - gerrit-trigger-scm:
@@ -83,7 +81,7 @@
 
     triggers:
       - reverse:
-          jobs: 'csit-vpp-device-{stream}-ubuntu1804-1n-skx-weekly'
+          jobs: 'csit-vpp-device-{stream}-{os}-{executor-arch}-1n-skx-weekly'
           result: 'success'
       - gerrit:
           server-name: 'Primary'
             notbuilt: true
 
     builders:
-      - maven-target:
-          maven-version: 'mvn33-new'
-          goals: '--version'
-          settings: 'csit-settings'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - provide-maven-settings:
-          settings-file: 'csit-settings'
-          global-settings-file: 'global-settings'
       - shell:
           !include-raw-escape:
           - ../scripts/setup_executor_env.sh
           - ../scripts/csit/docs.sh
 
     publishers:
+      - fdio-infra-publish-docs
       - fdio-infra-publish
 
 - job-template:
     project-type: freestyle
     node: 'builder-{os}-prod-{executor-arch}'
     concurrent: false
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - maven-exec:
-          maven-version: 'mvn33-new'
 
     scm:
       - gerrit-trigger-scm:
           credentials-id: 'jenkins-gerrit-credentials'
-          refspec: '$GERRIT_REFSPEC'
+          refspec: ''
           choosing-strategy: 'default'
 
     wrappers:
             notbuilt: true
 
     builders:
-      - maven-target:
-          maven-version: 'mvn33-new'
-          goals: '--version'
-          settings: 'csit-settings'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - provide-maven-settings:
-          settings-file: 'csit-settings'
-          global-settings-file: 'global-settings'
       - shell:
           !include-raw-escape:
           - ../scripts/setup_executor_env.sh
           - ../scripts/csit/report.sh
 
     publishers:
+      - fdio-infra-publish-docs
       - fdio-infra-publish
 
 - job-template:
-    name: 'csit-trending-daily-master-{os}-{executor-arch}'
+    name: 'csit-trending-merge-daily-master-{os}-{executor-arch}'
 
     project-type: freestyle
     node: 'builder-{os}-prod-{executor-arch}'
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - maven-exec:
-          maven-version: 'mvn33-new'
 
     scm:
       - gerrit-trigger-scm:
       - timed: '0 2,14 * * *'
 
     builders:
-      - maven-target:
-          maven-version: 'mvn33-new'
-          goals: '--version'
-          settings: 'csit-settings'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - provide-maven-settings:
-          settings-file: 'csit-settings'
-          global-settings-file: 'global-settings'
       - shell:
           !include-raw-escape:
           - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
-          - ../scripts/csit/cpta.sh
+          - ../scripts/csit/trending.sh
 
     publishers:
       - email-ext:
           always: true
           failure: false
 
+      - fdio-infra-publish-docs
       - fdio-infra-publish
 
 - job-template:
-    name: 'csit-trending-weekly-2009-lts-{os}-{executor-arch}'
+    name: 'csit-trending-merge-weekly-2009-lts-{os}-{executor-arch}'
 
     project-type: freestyle
     node: 'builder-{os}-prod-{executor-arch}'
           project: '{project}'
       - gerrit-parameter:
           branch: 'rls2009_lts'
-      - maven-exec:
-          maven-version: 'mvn33-new'
 
     scm:
       - gerrit-trigger-scm:
       - timed: '0 0 * * 1'
 
     builders:
-      - maven-target:
-          maven-version: 'mvn33-new'
-          goals: '--version'
-          settings: 'csit-settings'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - provide-maven-settings:
-          settings-file: 'csit-settings'
-          global-settings-file: 'global-settings'
       - shell:
           !include-raw-escape:
           - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
-          - ../scripts/csit/cpta.sh
+          - ../scripts/csit/trending.sh
 
     publishers:
       - email-ext:
           always: true
           failure: false
 
+      - fdio-infra-publish-docs
       - fdio-infra-publish
 
+
 - project:
     name: csit-info
     project-name: csit
index eed5c0b..8059ac5 100644 (file)
             - developers
             - recipients
 
+- publisher:
+    name: fdio-infra-publish-docs
+    # macro to finish up a build.
+    #
+    # Handles the following:
+    #   - Shipping docs S3 logs repository
+    #   - Cleanup workspace
+    publishers:
+      - postbuildscript:
+          builders:
+            - role: BOTH
+              build-on:
+                - ABORTED
+                - FAILURE
+                - NOT_BUILT
+                - SUCCESS
+                - UNSTABLE
+              build-steps:
+                - fdio-infra-ship-docs
+          mark-unstable-if-failed: true
+      - workspace-cleanup:
+          exclude:
+            # Do not clean up *.jenkins-trigger files for jobs that use a
+            # properties file as input for triggering another build.
+            - "**/*.jenkins-trigger"
+          fail-build: false
+
 - publisher:
     name: fdio-infra-publish
     # macro to finish up a build.
           days-to-keep: '{build-days-to-keep}'
           num-to-keep: '{build-num-to-keep}'
 
+- builder:
+    name: fdio-infra-ship-docs
+    builders:
+      - config-file-provider:
+          files:
+            - file-id: "jenkins-log-archives-settings"
+              variable: "SETTINGS_FILE"
+      - config-file-provider:
+          files:
+            - file-id: "jenkins-s3-docs-ship"
+              target: $HOME/.aws/credentials
+      - shell: !include-raw:
+          - scripts/publish_library_py.sh
+      - shell: !include-raw:
+          - scripts/publish_docs.sh
+      - shell: !include-raw:
+          - ../global-jjb/shell/logs-clear-credentials.sh
+
 - builder:
     name: fdio-infra-ship-backup-logs
     builders:
             - file-id: "jenkins-s3-log-ship"
               variable: $HOME/.aws/credentials
       - shell: !include-raw:
-          - scripts/logs_publish.sh
+          - scripts/publish_library_py.sh
+      - shell: !include-raw:
+          - scripts/publish_logs.sh
       - shell: !include-raw:
           - ../global-jjb/shell/logs-clear-credentials.sh
 
index 55048f2..9ecc78c 100644 (file)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
 # 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:
 
 echo "---> jjb/scripts/csit/docs.sh"
 
-set -xe -o pipefail
+set -exuo pipefail
 
-[ "$DOCS_REPO_URL" ] || DOCS_REPO_URL="https://nexus.fd.io/content/sites/site"
-[ "$PROJECT_PATH" ] || PROJECT_PATH=io/fd/csit
-[ "$DOC_DIR" ] || DOC_DIR=resources/tools/doc_gen
-[ "$BUILD_DIR" ] || BUILD_DIR=${DOC_DIR}/_build
-[ "$SITE_DIR" ] || SITE_DIR=build-root/docs/deploy-site
-[ "$RESOURCES_DIR" ] || RESOURCES_DIR=${SITE_DIR}/src/site/resources/doc
-[ "$MVN" ] || MVN="/opt/apache/maven/bin/mvn"
-
-cd ${DOC_DIR}
-chmod +x ./run_doc.sh
-./run_doc.sh ${GERRIT_BRANCH}
-
-retval=$?
-if [ ${retval} -ne "0" ]; then
-  echo "Documentation generation failed!"
-exit ${retval}
-fi
-
-if [[ ${JOB_NAME} == *merge* ]]; then
-
-  cd ${WORKSPACE}
-
-  mkdir -p ${RESOURCES_DIR}
-  mv -f ${BUILD_DIR}/* ${RESOURCES_DIR}
-  cd ${SITE_DIR}
-
-  cat > 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>io.fd.csit</groupId>
-    <artifactId>docs</artifactId>
-    <version>1.0.0</version>
-    <packaging>pom</packaging>
-    <properties>
-      <generateReports>false</generateReports>
-    </properties>
-    <build>
-      <extensions>
-        <extension>
-          <groupId>org.apache.maven.wagon</groupId>
-          <artifactId>wagon-webdav-jackrabbit</artifactId>
-          <version>2.10</version>
-        </extension>
-      </extensions>
-    </build>
-    <distributionManagement>
-      <site>
-        <id>fdio-site</id>
-        <url>dav:${DOCS_REPO_URL}/${PROJECT_PATH}/${GERRIT_BRANCH}</url>
-      </site>
-    </distributionManagement>
-  </project>
-EOF
-
-  ${MVN} site:site site:deploy -gs "${GLOBAL_SETTINGS_FILE}" -s "${SETTINGS_FILE}" -T 4C
-
-  cd -
-
-fi
+csit_entry_dir="${WORKSPACE}/resources/libraries/bash/entry"
+source "${csit_entry_dir}/bootstrap_docs.sh"
index 16018fd..0bd2e81 100644 (file)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
 # 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:
 
 echo "---> jjb/scripts/csit/report.sh"
 
-set -xe -o pipefail
+set -exuo pipefail
 
-[ "$DOCS_REPO_URL" ] || DOCS_REPO_URL="https://nexus.fd.io/content/sites/site"
-[ "$PROJECT_PATH" ] || PROJECT_PATH=io/fd/csit
-[ "$DOC_DIR" ] || DOC_DIR=resources/tools/presentation
-[ "$BUILD_DIR" ] || BUILD_DIR=${DOC_DIR}/_build
-[ "$SITE_DIR" ] || SITE_DIR=build-root/docs/deploy-site
-[ "$RESOURCES_DIR" ] || RESOURCES_DIR=${SITE_DIR}/src/site/resources/report
-[ "$MVN" ] || MVN="/opt/apache/maven/bin/mvn"
-
-cd ${DOC_DIR}
-chmod +x ./run_report.sh
-./run_report.sh ${GERRIT_BRANCH}
-
-retval=$?
-if [ ${retval} -ne "0" ]; then
-  echo "Report generation failed!"
-exit ${retval}
-fi
-
-if [[ ${JOB_NAME} == *merge* ]]; then
-
-  cd ${WORKSPACE}
-
-  mkdir -p ${RESOURCES_DIR}
-  mv -f ${BUILD_DIR}/* ${RESOURCES_DIR}
-  cd ${SITE_DIR}
-
-  cat > 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>io.fd.csit</groupId>
-    <artifactId>docs</artifactId>
-    <version>1.0.0</version>
-    <packaging>pom</packaging>
-    <properties>
-      <generateReports>false</generateReports>
-    </properties>
-    <build>
-      <extensions>
-        <extension>
-          <groupId>org.apache.maven.wagon</groupId>
-          <artifactId>wagon-webdav-jackrabbit</artifactId>
-          <version>2.10</version>
-        </extension>
-      </extensions>
-    </build>
-    <distributionManagement>
-      <site>
-        <id>fdio-site</id>
-        <url>dav:${DOCS_REPO_URL}/${PROJECT_PATH}/${GERRIT_BRANCH}</url>
-      </site>
-    </distributionManagement>
-  </project>
-EOF
-
-  ${MVN} site:site site:deploy -gs "${GLOBAL_SETTINGS_FILE}" -s "${SETTINGS_FILE}" -T 4C
-
-  cd -
-
-fi
+csit_entry_dir="${WORKSPACE}/resources/libraries/bash/entry"
+source "${csit_entry_dir}/bootstrap_report.sh"
diff --git a/jjb/scripts/csit/trending.sh b/jjb/scripts/csit/trending.sh
new file mode 100644 (file)
index 0000000..715d15b
--- /dev/null
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# Copyright (c) 2021 Cisco and/or its affiliates.
+# 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.
+
+echo "---> jjb/scripts/csit/trending.sh"
+
+set -exuo pipefail
+
+csit_entry_dir="${WORKSPACE}/resources/libraries/bash/entry"
+source "${csit_entry_dir}/bootstrap_trending.sh"
diff --git a/jjb/scripts/publish_docs.sh b/jjb/scripts/publish_docs.sh
new file mode 100644 (file)
index 0000000..7246ffc
--- /dev/null
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# Copyright (c) 2021 Cisco and/or its affiliates.
+# 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.
+
+echo "---> publish_docs.sh"
+
+set -exuo pipefail
+
+S3_BUCKET="fdio-docs-s3-cloudfront-index"
+CDN_URL="s3-docs.fd.io"
+PYTHON_SCRIPT="/w/workspace/publish_library.py"
+
+if [[ ${JOB_NAME} == *merge* ]]; then
+    case "${JOB_NAME}" in
+        *"csit-trending"*)
+            SITE_DIR="${WORKSPACE}/resources/tools/presentation/_build"
+            s3_path="csit/${GERRIT_BRANCH}/trending"
+            ;;
+        *"csit-report"*)
+            SITE_DIR="${WORKSPACE}/resources/tools/presentation/_build"
+            s3_path="csit/${GERRIT_BRANCH}/report"
+            ;;
+        *"csit-docs"*)
+            SITE_DIR="${WORKSPACE}/resources/tools/doc_gen/_build"
+            s3_path="csit/${GERRIT_BRANCH}/docs"
+            ;;
+        *)
+            die "Unknown job: ${JOB_NAME}"
+    esac
+
+    echo "INFO: S3 path $s3_path"
+
+    echo "INFO: archiving docs to S3"
+    python3 $PYTHON_SCRIPT deploy_docs "$S3_BUCKET" "$s3_path" "$SITE_DIR"
+
+    echo "S3 docs: <a href=\"https://$CDN_URL/$s3_path\">https://$CDN_URL/$s3_path</a>"
+fi
similarity index 86%
rename from jjb/scripts/logs_publish.sh
rename to jjb/scripts/publish_library_py.sh
index da3593c..f8430ff 100644 (file)
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-echo "---> logs_publish.sh"
+echo "---> publish_library_py.sh"
 
-CDN_URL="logs.nginx.service.consul"
-export AWS_ENDPOINT_URL="http://storage.service.consul:9000"
+set -exuo pipefail
 
-# FIXME: s3 config (until migrated to config provider, then pwd will be reset)
-mkdir -p ${HOME}/.aws
-echo "[default]
-aws_access_key_id = storage
-aws_secret_access_key = Storage1234" >> "$HOME/.aws/credentials"
-
-PYTHON_SCRIPT="/w/workspace/test-logs/logs_publish.py"
-
-# This script uploads the artifacts to a backup upload location
-if [ -f "$PYTHON_SCRIPT" ]; then
-    echo "WARNING: $PYTHON_SCRIPT already exists - assume backup archive upload already done"
-    exit 0
-fi
+PYTHON_SCRIPT="/w/workspace/publish_library.py"
 
 pip3 install boto3
 mkdir -p $(dirname "$PYTHON_SCRIPT")
@@ -38,7 +25,7 @@ mkdir -p $(dirname "$PYTHON_SCRIPT")
 cat >$PYTHON_SCRIPT <<'END_OF_PYTHON_SCRIPT'
 #!/usr/bin/python3
 
-"""Storage utilities library."""
+"""S3 publish library."""
 
 import gzip
 import logging
@@ -130,7 +117,7 @@ def upload(s3_resource, s3_bucket, src_fpath, s3_path):
     if not mime:
         mime = u"application/octet-stream"
 
-    if s3_bucket not in u"docs.fd.io":
+    if u"logs" in s3_bucket:
         if mime in COMPRESS_MIME and encoding != u"gzip":
             compress(src_fpath)
             src_fpath = src_fpath + u".gz"
@@ -178,6 +165,27 @@ def upload_recursive(s3_resource, s3_bucket, src_fpath, s3_path):
             )
 
 
+def deploy_docs(s3_bucket, s3_path, docs_dir):
+    """Ship docs dir content to S3 bucket. Requires the s3 bucket to exist.
+
+    :param s3_bucket: Name of S3 bucket. Eg: lf-project-date
+    :param s3_path: Path on S3 bucket to place the docs. Eg:
+        csit/${GERRIT_BRANCH}/report
+    :param docs_dir: Directory in which to recursively upload content.
+    :type s3_bucket: Object
+    :type s3_path: str
+    :type docs_dir: str
+    """
+    s3_resource = boto3.resource(u"s3")
+
+    upload_recursive(
+        s3_resource=s3_resource,
+        s3_bucket=s3_bucket,
+        src_fpath=docs_dir,
+        s3_path=s3_path
+    )
+
+
 def deploy_s3(s3_bucket, s3_path, build_url, workspace):
     """Add logs and archives to temp directory to be shipped to S3 bucket.
     Fetches logs and system information and pushes them and archives to S3
@@ -273,19 +281,3 @@ if __name__ == u"__main__":
     globals()[sys.argv[1]](*sys.argv[2:])
 
 END_OF_PYTHON_SCRIPT
-
-# The 'deploy_s3' command below expects the archives
-# directory to exist.  Normally lf-infra-sysstat or similar would
-# create it and add content, but to make sure this script is
-# self-contained, we ensure it exists here.
-mkdir -p "$WORKSPACE/archives"
-
-s3_path="$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER/"
-echo "INFO: S3 path $s3_path"
-
-echo "INFO: archiving backup logs to S3"
-# shellcheck disable=SC2086
-python3 $PYTHON_SCRIPT deploy_s3 "logs.fd.io" "$s3_path" \
-    "$BUILD_URL" "$WORKSPACE"
-
-echo "S3 build backup logs: <a href=\"https://$CDN_URL/$s3_path\">https://$CDN_URL/$s3_path</a>"
diff --git a/jjb/scripts/publish_logs.sh b/jjb/scripts/publish_logs.sh
new file mode 100644 (file)
index 0000000..bc1e24c
--- /dev/null
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# Copyright (c) 2021 Cisco and/or its affiliates.
+# 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.
+
+echo "---> publish_logs.sh"
+
+S3_BUCKET="logs.fd.io"
+CDN_URL="logs.nginx.service.consul"
+export AWS_ENDPOINT_URL="http://storage.service.consul:9000"
+PYTHON_SCRIPT="/w/workspace/publish_library.py"
+
+# FIXME: s3 config (until migrated to config provider, then pwd will be reset)
+mkdir -p ${HOME}/.aws
+echo "[default]
+aws_access_key_id = storage
+aws_secret_access_key = Storage1234" > "$HOME/.aws/credentials"
+
+mkdir -p "$WORKSPACE/archives"
+
+s3_path="$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER/"
+
+echo "INFO: S3 path $s3_path"
+
+echo "INFO: archiving backup logs to S3"
+python3 $PYTHON_SCRIPT deploy_s3 "$S3_BUCKET" "$s3_path" \
+    "$BUILD_URL" "$WORKSPACE"
+
+echo "S3 build backup logs: <a href=\"https://$CDN_URL/$s3_path\">https://$CDN_URL/$s3_path</a>"
index 7086f4d..14b7b69 100644 (file)
       - config-file-provider:
           files:
             - file-id: '.packagecloud'
-              target: '/root'
+              target: '/root/.packagecloud'
       - config-file-provider:
           files:
             - file-id: 'packagecloud_api'
-              target: '/root'
+              target: '/root/packagecloud_api'
       - shell:
           !include-raw-escape: include-raw-udpi-checkstyle.sh
       - shell:
       - config-file-provider:
           files:
             - file-id: '.packagecloud'
-              target: '/root'
+              target: '/root/.packagecloud'
       - config-file-provider:
           files:
             - file-id: 'packagecloud_api'
-              target: '/root'
+              target: '/root/packagecloud_api'
       - shell:
           !include-raw-escape: include-raw-udpi-checkstyle.sh
       - shell:
index cac2932..db46533 100644 (file)
       - config-file-provider:
           files:
             - file-id: '.packagecloud'
-              target: '/root'
+              target: '/root/.packagecloud'
       - config-file-provider:
           files:
             - file-id: 'packagecloud_api'
-              target: '/root'
+              target: '/root/packagecloud_api'
       - shell:
           !include-raw-escape:
           - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/vpp/check_crc.sh
-      # TODO: Add sending e-mail notifications to vpp-api-dev@lists.fd.io
+    # TODO: Add sending e-mail notifications to vpp-api-dev@lists.fd.io
 
     publishers:
       - fdio-infra-publish
index 31c4b43..2011336 100644 (file)
       - config-file-provider:
           files:
             - file-id: '.packagecloud'
-              target: '/root'
+              target: '/root/.packagecloud'
       - config-file-provider:
           files:
             - file-id: 'packagecloud_api'
-              target: '/root'
+              target: '/root/packagecloud_api'
       - shell:
           !include-raw-escape:
           - include-raw-vsap-build.sh