-
Notifications
You must be signed in to change notification settings - Fork 1.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[JENKINS-57116] Fix empty yamls introduced on upgrade to 1.15.1 #462
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
144 changes: 144 additions & 0 deletions
144
...rces/org/csanchez/jenkins/plugins/kubernetes/KubernetesTest/upgradeFrom_1_15_1/config.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| <?xml version='1.1' encoding='UTF-8'?> | ||
| <hudson> | ||
| <disabledAdministrativeMonitors/> | ||
| <version>2.138.4</version> | ||
| <installStateName>DEVELOPMENT</installStateName> | ||
| <numExecutors>2</numExecutors> | ||
| <mode>NORMAL</mode> | ||
| <useSecurity>true</useSecurity> | ||
| <authorizationStrategy class="hudson.security.AuthorizationStrategy$Unsecured"/> | ||
| <securityRealm class="hudson.security.SecurityRealm$None"/> | ||
| <disableRememberMe>false</disableRememberMe> | ||
| <projectNamingStrategy class="jenkins.model.ProjectNamingStrategy$DefaultProjectNamingStrategy"/> | ||
| <workspaceDir>${JENKINS_HOME}/workspace/${ITEM_FULLNAME}</workspaceDir> | ||
| <buildsDir>${ITEM_ROOTDIR}/builds</buildsDir> | ||
| <jdks/> | ||
| <viewsTabBar class="hudson.views.DefaultViewsTabBar"/> | ||
| <myViewsTabBar class="hudson.views.DefaultMyViewsTabBar"/> | ||
| <clouds> | ||
| <org.csanchez.jenkins.plugins.kubernetes.KubernetesCloud plugin="[email protected]"> | ||
| <name>kubernetes</name> | ||
| <defaultsProviderTemplate></defaultsProviderTemplate> | ||
| <templates> | ||
| <org.csanchez.jenkins.plugins.kubernetes.PodTemplate> | ||
| <inheritFrom></inheritFrom> | ||
| <name>java</name> | ||
| <namespace></namespace> | ||
| <privileged>false</privileged> | ||
| <capOnlyOnAlivePods>false</capOnlyOnAlivePods> | ||
| <alwaysPullImage>false</alwaysPullImage> | ||
| <instanceCap>2147483647</instanceCap> | ||
| <slaveConnectTimeout>100</slaveConnectTimeout> | ||
| <idleMinutes>0</idleMinutes> | ||
| <activeDeadlineSeconds>0</activeDeadlineSeconds> | ||
| <label>java</label> | ||
| <nodeSelector></nodeSelector> | ||
| <nodeUsageMode>NORMAL</nodeUsageMode> | ||
| <customWorkspaceVolumeEnabled>false</customWorkspaceVolumeEnabled> | ||
| <workspaceVolume class="org.csanchez.jenkins.plugins.kubernetes.volumes.workspace.EmptyDirWorkspaceVolume"> | ||
| <memory>false</memory> | ||
| </workspaceVolume> | ||
| <volumes> | ||
| <org.csanchez.jenkins.plugins.kubernetes.volumes.EmptyDirVolume> | ||
| <mountPath>/mnt</mountPath> | ||
| <memory>false</memory> | ||
| </org.csanchez.jenkins.plugins.kubernetes.volumes.EmptyDirVolume> | ||
| <org.csanchez.jenkins.plugins.kubernetes.volumes.HostPathVolume> | ||
| <mountPath>/host</mountPath> | ||
| <hostPath>/mnt/host</hostPath> | ||
| </org.csanchez.jenkins.plugins.kubernetes.volumes.HostPathVolume> | ||
| </volumes> | ||
| <containers> | ||
| <org.csanchez.jenkins.plugins.kubernetes.ContainerTemplate> | ||
| <name>jnlp</name> | ||
| <image>jenkins/jnlp-slave</image> | ||
| <privileged>false</privileged> | ||
| <alwaysPullImage>false</alwaysPullImage> | ||
| <workingDir>/home/jenkins</workingDir> | ||
| <command></command> | ||
| <args>${computer.jnlpmac} ${computer.name}</args> | ||
| <ttyEnabled>false</ttyEnabled> | ||
| <resourceRequestCpu>500m</resourceRequestCpu> | ||
| <resourceRequestMemory>250Mi</resourceRequestMemory> | ||
| <resourceLimitCpu>500m</resourceLimitCpu> | ||
| <resourceLimitMemory>250Mi</resourceLimitMemory> | ||
| <envVars> | ||
| <org.csanchez.jenkins.plugins.kubernetes.PodEnvVar> | ||
| <key>a</key> | ||
| <value>b</value> | ||
| </org.csanchez.jenkins.plugins.kubernetes.PodEnvVar> | ||
| <org.csanchez.jenkins.plugins.kubernetes.PodEnvVar> | ||
| <key>c</key> | ||
| <value>d</value> | ||
| </org.csanchez.jenkins.plugins.kubernetes.PodEnvVar> | ||
| </envVars> | ||
| <ports/> | ||
| <livenessProbe> | ||
| <execArgs></execArgs> | ||
| <timeoutSeconds>0</timeoutSeconds> | ||
| <initialDelaySeconds>0</initialDelaySeconds> | ||
| <failureThreshold>0</failureThreshold> | ||
| <periodSeconds>0</periodSeconds> | ||
| <successThreshold>0</successThreshold> | ||
| </livenessProbe> | ||
| </org.csanchez.jenkins.plugins.kubernetes.ContainerTemplate> | ||
| </containers> | ||
| <envVars> | ||
| <org.csanchez.jenkins.plugins.kubernetes.PodEnvVar> | ||
| <key>a</key> | ||
| <value>b</value> | ||
| </org.csanchez.jenkins.plugins.kubernetes.PodEnvVar> | ||
| <org.csanchez.jenkins.plugins.kubernetes.PodEnvVar> | ||
| <key>c</key> | ||
| <value>d</value> | ||
| </org.csanchez.jenkins.plugins.kubernetes.PodEnvVar> | ||
| </envVars> | ||
| <annotations> | ||
| <org.csanchez.jenkins.plugins.kubernetes.PodAnnotation> | ||
| <key>aa</key> | ||
| <value>bb</value> | ||
| </org.csanchez.jenkins.plugins.kubernetes.PodAnnotation> | ||
| </annotations> | ||
| <imagePullSecrets> | ||
| <org.csanchez.jenkins.plugins.kubernetes.PodImagePullSecret> | ||
| <name></name> | ||
| </org.csanchez.jenkins.plugins.kubernetes.PodImagePullSecret> | ||
| </imagePullSecrets> | ||
| <yamls> | ||
| <string></string> | ||
| </yamls> | ||
| <podRetention class="org.csanchez.jenkins.plugins.kubernetes.pod.retention.Default"/> | ||
| </org.csanchez.jenkins.plugins.kubernetes.PodTemplate> | ||
| </templates> | ||
| <serverUrl>https://192.168.64.1</serverUrl> | ||
| <skipTlsVerify>true</skipTlsVerify> | ||
| <addMasterProxyEnvVars>false</addMasterProxyEnvVars> | ||
| <capOnlyOnAlivePods>false</capOnlyOnAlivePods> | ||
| <namespace>default</namespace> | ||
| <containerCap>10</containerCap> | ||
| <retentionTimeout>5</retentionTimeout> | ||
| <connectTimeout>0</connectTimeout> | ||
| <readTimeout>0</readTimeout> | ||
| <usageRestricted>false</usageRestricted> | ||
| <maxRequestsPerHost>32</maxRequestsPerHost> | ||
| <waitForPodSec>600</waitForPodSec> | ||
| <podRetention class="org.csanchez.jenkins.plugins.kubernetes.pod.retention.Never"/> | ||
| </org.csanchez.jenkins.plugins.kubernetes.KubernetesCloud> | ||
| </clouds> | ||
| <quietPeriod>5</quietPeriod> | ||
| <scmCheckoutRetryCount>0</scmCheckoutRetryCount> | ||
| <views> | ||
| <hudson.model.AllView> | ||
| <owner class="hudson" reference="../../.."/> | ||
| <name>all</name> | ||
| <filterExecutors>false</filterExecutors> | ||
| <filterQueue>false</filterQueue> | ||
| <properties class="hudson.model.View$PropertyList"/> | ||
| </hudson.model.AllView> | ||
| </views> | ||
| <primaryView>all</primaryView> | ||
| <slaveAgentPort>0</slaveAgentPort> | ||
| <label></label> | ||
| <nodeProperties/> | ||
| <globalNodeProperties/> | ||
| </hudson> |
30 changes: 30 additions & 0 deletions
30
...org/csanchez/jenkins/plugins/kubernetes/KubernetesTest/upgradeFrom_1_15_1/credentials.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| <?xml version='1.0' encoding='UTF-8'?> | ||
| <com.cloudbees.plugins.credentials.SystemCredentialsProvider plugin="[email protected]"> | ||
| <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.OpenShiftBearerTokenCredentialImpl plugin="[email protected]"> | ||
| <scope>GLOBAL</scope> | ||
| <id>token</id> | ||
| <description></description> | ||
| <username>myusername</username> | ||
| <password>TBRF5XYf8ZzxjIllyloGBQ==</password> | ||
| </org.csanchez.jenkins.plugins.kubernetes.OpenShiftBearerTokenCredentialImpl> | ||
| <org.csanchez.jenkins.plugins.kubernetes.ServiceAccountCredential plugin="[email protected]"> | ||
| <scope>GLOBAL</scope> | ||
| <id>kubernetes-service-account</id> | ||
| <description></description> | ||
| </org.csanchez.jenkins.plugins.kubernetes.ServiceAccountCredential> | ||
| <org.csanchez.jenkins.plugins.kubernetes.OpenShiftTokenCredentialImpl plugin="[email protected]"> | ||
| <scope>GLOBAL</scope> | ||
| <id>openshift-oauth-token</id> | ||
| <description></description> | ||
| <secret>mytoken</secret> | ||
| </org.csanchez.jenkins.plugins.kubernetes.OpenShiftTokenCredentialImpl> | ||
| </java.util.concurrent.CopyOnWriteArrayList> | ||
| </entry> | ||
| </domainCredentialsMap> | ||
| </com.cloudbees.plugins.credentials.SystemCredentialsProvider> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@carlossg was there a flaky test we were using the rerun option for?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
there have been some flaky tests in the past, but I'd rather avoid rerunning and fix them, and we have 2 different builds happening