Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions jenkins_home/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<string>jenkins.security.s2m.MasterKillSwitchWarning</string>
</disabledAdministrativeMonitors>
<version>2.32.2</version>
<numExecutors>10</numExecutors>
<numExecutors>7</numExecutors>
<mode>EXCLUSIVE</mode>
<useSecurity>true</useSecurity>
<authorizationStrategy class="org.jenkinsci.plugins.GithubAuthorizationStrategy" plugin="github-oauth@0.25">
Expand Down Expand Up @@ -57,7 +57,7 @@
<name>ubuntu-16-04</name>
<privileged>false</privileged>
<alwaysPullImage>false</alwaysPullImage>
<instanceCap>20</instanceCap>
<instanceCap>10</instanceCap>
<idleMinutes>0</idleMinutes>
<label>ubuntu-16-04</label>
<nodeSelector></nodeSelector>
Expand All @@ -75,7 +75,7 @@
<workingDir>/home/jenkins</workingDir>
<command></command>
<args>${computer.jnlpmac} ${computer.name}</args>
<ttyEnabled>false</ttyEnabled>
<ttyEnabled>true</ttyEnabled>
<resourceRequestCpu>500m</resourceRequestCpu>
<resourceRequestMemory>512Mi</resourceRequestMemory>
<resourceLimitCpu>2000m</resourceLimitCpu>
Expand Down Expand Up @@ -120,7 +120,7 @@
<workingDir>/home/jenkins</workingDir>
<command></command>
<args>${computer.jnlpmac} ${computer.name}</args>
<ttyEnabled>false</ttyEnabled>
<ttyEnabled>true</ttyEnabled>
<resourceRequestCpu>500m</resourceRequestCpu>
<resourceRequestMemory>512Mi</resourceRequestMemory>
<resourceLimitCpu>4000m</resourceLimitCpu>
Expand Down Expand Up @@ -183,9 +183,8 @@
<namespace>jenkins</namespace>
<jenkinsUrl>http://jenkins-ui.jenkins.svc.cluster.local:8080</jenkinsUrl>
<jenkinsTunnel>jenkins-discovery.jenkins.svc.cluster.local:50000</jenkinsTunnel>
<credentialsId>jenkins</credentialsId>
<containerCap>30</containerCap>
<retentionTimeout>5</retentionTimeout>
<containerCap>20</containerCap>
<retentionTimeout>20</retentionTimeout>
<connectTimeout>0</connectTimeout>
<readTimeout>0</readTimeout>
</org.csanchez.jenkins.plugins.kubernetes.KubernetesCloud>
Expand Down
14 changes: 10 additions & 4 deletions jenkins_home/credentials.xml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<?xml version='1.0' encoding='UTF-8'?>
<com.cloudbees.plugins.credentials.SystemCredentialsProvider plugin="credentials@2.1.11">
<com.cloudbees.plugins.credentials.SystemCredentialsProvider plugin="credentials@2.1.12">
<domainCredentialsMap class="hudson.util.CopyOnWriteMap$Hash">
<entry>
<com.cloudbees.plugins.credentials.domains.Domain>
<specifications/>
</com.cloudbees.plugins.credentials.domains.Domain>
<java.util.concurrent.CopyOnWriteArrayList>
<org.csanchez.jenkins.plugins.kubernetes.ServiceAccountCredential plugin="kubernetes@0.10">
<org.csanchez.jenkins.plugins.kubernetes.ServiceAccountCredential plugin="kubernetes@0.11">
<scope>GLOBAL</scope>
<id>jenkins</id>
<description>jenkins</description>
</org.csanchez.jenkins.plugins.kubernetes.ServiceAccountCredential>
<org.jenkinsci.plugins.plaincredentials.impl.StringCredentialsImpl plugin="plain-credentials@1.3">
<org.jenkinsci.plugins.plaincredentials.impl.StringCredentialsImpl plugin="plain-credentials@1.4">
<scope>GLOBAL</scope>
<id>istio-testing</id>
<description>Istio Testing Jenkins</description>
<secret>{AQAAABAAAAAwf+ymSMBqyx4qkUNcyDwbUwPkrTARMzVHGPA/ZpAwXAo42fuJW+xCusCZ3oF6SpUyCyF04LDHdxhOTY1qQdwkPA==}</secret>
</org.jenkinsci.plugins.plaincredentials.impl.StringCredentialsImpl>
<org.jenkinsci.plugins.plaincredentials.impl.StringCredentialsImpl plugin="plain-credentials@1.3">
<org.jenkinsci.plugins.plaincredentials.impl.StringCredentialsImpl plugin="plain-credentials@1.4">
<scope>GLOBAL</scope>
<id>MANAGER_CODECOV_TOKEN</id>
<description>Repository Upload Token for https://codecov.io/gh/istio/manager</description>
Expand All @@ -30,6 +30,12 @@
<username>istiotesting</username>
<password>{AQAAABAAAAAwGetPp4QyLCCJ/fPSj6+CFdC/zV+W+qMvA5+TtQL44/fMpPRyqX972S313lzN5iHHRbsz3Z9x6Ng01wxfBgzMOw==}</password>
</com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl>
<org.jenkinsci.plugins.plaincredentials.impl.StringCredentialsImpl plugin="plain-credentials@1.4">
<scope>GLOBAL</scope>
<id>MIXER_CODECOV_TOKEN</id>
<description>Codecov for Mixer</description>
<secret>{AQAAABAAAAAwodQnLGkcRYb25vO24oteC8KC2vhGKeWA+uoaLPkrbhn4yQmZekvJhxrG0IpMeV2BbKjV7UmafAwGohhXS9+R9A==}</secret>
</org.jenkinsci.plugins.plaincredentials.impl.StringCredentialsImpl>
</java.util.concurrent.CopyOnWriteArrayList>
</entry>
</domainCredentialsMap>
Expand Down
4 changes: 2 additions & 2 deletions jenkins_home/github-plugin-configuration.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<github-plugin-configuration plugin="github@1.26.0">
<github-plugin-configuration plugin="github@1.26.1">
<configs>
<github-server-config>
<apiUrl>https://api.github.com</apiUrl>
<manageHooks>false</manageHooks>
<manageHooks>true</manageHooks>
<credentialsId>istio-testing</credentialsId>
<clientCacheSize>20</clientCacheSize>
</github-server-config>
Expand Down
2 changes: 1 addition & 1 deletion jenkins_home/jobs/istio-testing/jobs/pr-master/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<artifactNumToKeep>-1</artifactNumToKeep>
</strategy>
</jenkins.model.BuildDiscarderProperty>
<com.coravy.hudson.plugins.github.GithubProjectProperty plugin="github@1.26.0">
<com.coravy.hudson.plugins.github.GithubProjectProperty plugin="github@1.26.1">
<projectUrl>https://github.com/istio/istio-testing/</projectUrl>
<displayName></displayName>
</com.coravy.hudson.plugins.github.GithubProjectProperty>
Expand Down
111 changes: 111 additions & 0 deletions jenkins_home/jobs/istio-testing/jobs/pr-stable/config.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
<?xml version='1.0' encoding='UTF-8'?>
<flow-definition plugin="workflow-job@2.10">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
<properties>
<jenkins.model.BuildDiscarderProperty>
<strategy class="hudson.tasks.LogRotator">
<daysToKeep>15</daysToKeep>
<numToKeep>20</numToKeep>
<artifactDaysToKeep>-1</artifactDaysToKeep>
<artifactNumToKeep>-1</artifactNumToKeep>
</strategy>
</jenkins.model.BuildDiscarderProperty>
<com.coravy.hudson.plugins.github.GithubProjectProperty plugin="github@1.26.1">
<projectUrl>https://github.com/istio/istio-testing/</projectUrl>
<displayName></displayName>
</com.coravy.hudson.plugins.github.GithubProjectProperty>
<com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.25">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>STAGE</name>
<description></description>
<defaultValue>_SLAVE_UPDATE</defaultValue>
</hudson.model.StringParameterDefinition>
<hudson.model.BooleanParameterDefinition>
<name>UPDATE_PR</name>
<description></description>
<defaultValue>true</defaultValue>
</hudson.model.BooleanParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>GITHUB_REPO</name>
<description></description>
<defaultValue>istio-testing</defaultValue>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.9.0">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>3</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
<throttleEnabled>true</throttleEnabled>
<throttleOption>project</throttleOption>
<limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
<triggers>
<org.jenkinsci.plugins.github.pullrequest.GitHubPRTrigger plugin="github-pullrequest@0.1.0-rc21">
<spec>H/5 * * * *</spec>
<triggerMode>HEAVY_HOOKS</triggerMode>
<cancelQueued>true</cancelQueued>
<abortRunning>false</abortRunning>
<skipFirstRun>false</skipFirstRun>
<repoProviders>
<com.github.kostyasha.github.integration.generic.repoprovider.GitHubPluginRepoProvider>
<cacheConnection>true</cacheConnection>
</com.github.kostyasha.github.integration.generic.repoprovider.GitHubPluginRepoProvider>
</repoProviders>
<errorsAction>
<description>GitHub Pull Requests Trigger Errors</description>
<errors class="java.util.Collections$SynchronizedSet" serialization="custom">
<java.util.Collections_-SynchronizedCollection>
<default>
<c class="set"/>
<mutex class="java.util.Collections$SynchronizedSet" reference="../../.."/>
</default>
</java.util.Collections_-SynchronizedCollection>
</errors>
</errorsAction>
<events>
<org.jenkinsci.plugins.github.pullrequest.events.impl.GitHubPROpenEvent/>
<org.jenkinsci.plugins.github.pullrequest.events.impl.GitHubPRCommitEvent/>
</events>
<preStatus>true</preStatus>
<branchRestriction>
<targetBranchList>
<string>stable</string>
</targetBranchList>
</branchRestriction>
</org.jenkinsci.plugins.github.pullrequest.GitHubPRTrigger>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
<definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.28">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.0.5">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
<name>origin-pull</name>
<refspec>+refs/pull/${GITHUB_PR_NUMBER}/head:refs/remotes/origin-pull/pull/${GITHUB_PR_NUMBER}/head</refspec>
<url>https://github.com/istio/istio-testing</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
<name>origin-pull/pull/${GITHUB_PR_NUMBER}/head</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
<submoduleCfg class="list"/>
<extensions/>
</scm>
<scriptPath>Jenkinsfile</scriptPath>
</definition>
<triggers/>
</flow-definition>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<flow-definition plugin="workflow-job@2.9">
<flow-definition plugin="workflow-job@2.10">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
Expand All @@ -13,7 +13,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
<com.coravy.hudson.plugins.github.GithubProjectProperty plugin="github@1.25.1">
<com.coravy.hudson.plugins.github.GithubProjectProperty plugin="github@1.26.1">
<projectUrl>https://github.com/istio/istio-testing/</projectUrl>
<displayName></displayName>
</com.coravy.hudson.plugins.github.GithubProjectProperty>
Expand All @@ -26,7 +26,7 @@
<hudson.model.StringParameterDefinition>
<name>BRANCH_SPEC</name>
<description></description>
<defaultValue>master</defaultValue>
<defaultValue>stable</defaultValue>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>STAGE</name>
Expand Down Expand Up @@ -57,8 +57,8 @@
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
<definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.24">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.0.1">
<definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.28">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.0.5">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
Expand Down
8 changes: 4 additions & 4 deletions jenkins_home/jobs/istio-testing/jobs/update-stable/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
<com.coravy.hudson.plugins.github.GithubProjectProperty plugin="github@1.26.0">
<com.coravy.hudson.plugins.github.GithubProjectProperty plugin="github@1.26.1">
<projectUrl>https://github.com/istio/istio-testing/</projectUrl>
<displayName></displayName>
</com.coravy.hudson.plugins.github.GithubProjectProperty>
Expand All @@ -24,9 +24,9 @@
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>GITHUB_REPO</name>
<name>GITHUB_REPOS</name>
<description></description>
<defaultValue>istio-testing</defaultValue>
<defaultValue>istio-testing,mixer,proxy,manager</defaultValue>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
Expand All @@ -47,7 +47,7 @@
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
<definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.26">
<definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.28">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.0.5">
<configVersion>2</configVersion>
<userRemoteConfigs>
Expand Down
4 changes: 2 additions & 2 deletions jenkins_home/jobs/manager/config.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@5.17">
<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@5.18">
<actions/>
<description></description>
<properties>
<org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.0.1">
<org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.0.2">
<dockerLabel></dockerLabel>
<registry plugin="docker-commons@1.6"/>
</org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
Expand Down
8 changes: 6 additions & 2 deletions jenkins_home/jobs/manager/jobs/postsubmit/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
<com.coravy.hudson.plugins.github.GithubProjectProperty plugin="github@1.26.0">
<com.coravy.hudson.plugins.github.GithubProjectProperty plugin="github@1.26.1">
<projectUrl>https://github.com/istio/manager/</projectUrl>
<displayName></displayName>
</com.coravy.hudson.plugins.github.GithubProjectProperty>
Expand All @@ -32,9 +32,13 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
<triggers>
<com.cloudbees.jenkins.GitHubPushTrigger plugin="github@1.26.0">
<com.cloudbees.jenkins.GitHubPushTrigger plugin="github@1.26.1">
<spec></spec>
</com.cloudbees.jenkins.GitHubPushTrigger>
<hudson.triggers.SCMTrigger>
<spec>H/2 * * * *</spec>
<ignorePostCommitHooks>false</ignorePostCommitHooks>
</hudson.triggers.SCMTrigger>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
Expand Down
29 changes: 29 additions & 0 deletions jenkins_home/jobs/mixer/config.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version='1.0' encoding='UTF-8'?>
<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@5.18">
<actions/>
<description></description>
<properties>
<org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.0.2">
<dockerLabel></dockerLabel>
<registry plugin="docker-commons@1.6"/>
</org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
</properties>
<folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
<views>
<hudson.model.AllView>
<owner class="com.cloudbees.hudson.plugins.folder.Folder" reference="../../../.."/>
<name>All</name>
<filterExecutors>false</filterExecutors>
<filterQueue>false</filterQueue>
<properties class="hudson.model.View$PropertyList"/>
</hudson.model.AllView>
</views>
<tabBar class="hudson.views.DefaultViewsTabBar"/>
</folderViews>
<healthMetrics>
<com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
<nonRecursive>false</nonRecursive>
</com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
</healthMetrics>
<icon class="com.cloudbees.hudson.plugins.folder.icons.StockFolderIcon"/>
</com.cloudbees.hudson.plugins.folder.Folder>
Loading