diff options
author | HÃ¥kon Hallingstad <hakon@oath.com> | 2018-08-31 15:04:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-31 15:04:27 +0200 |
commit | 314e1e869495aff453acd257de353008344ca62a (patch) | |
tree | 0cd2439ba02f156845160889a88ae5c8b10ab380 | |
parent | 050a482646ebfe32fedfa45b10029389d9b21ab2 (diff) | |
parent | aafec2c07f9eaf166bd91c8f818256f86d146716 (diff) |
Merge pull request #6758 from vespa-engine/hakonhall/swap-version-and-release
Swap version and release
2 files changed, 12 insertions, 2 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumPackageName.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumPackageName.java index 481b560dc74..137ad31ec82 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumPackageName.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumPackageName.java @@ -70,8 +70,8 @@ public class YumPackageName { public Builder setEpoch(String epoch) { this.epoch = Optional.of(epoch); return this; } public Builder setName(String name) { this.name = name; return this; } - public Builder setRelease(String version) { this.version = Optional.of(version); return this; } - public Builder setVersion(String release) { this.release = Optional.of(release); return this; } + public Builder setVersion(String version) { this.version = Optional.of(version); return this; } + public Builder setRelease(String release) { this.release = Optional.of(release); return this; } public Builder setArchitecture(String architecture) { this.architecture = Optional.of(architecture); return this; } public YumPackageName build() { return new YumPackageName(epoch, name, version, release, architecture); } diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumPackageNameTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumPackageNameTest.java index 2e1ef4c0a61..a3c608887e0 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumPackageNameTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumPackageNameTest.java @@ -12,6 +12,16 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; public class YumPackageNameTest { + @Test + public void testBuilder() { + YumPackageName yumPackage = new YumPackageName.Builder("docker") + .setEpoch("2") + .setVersion("1.12.6") + .setRelease("71.git3e8e77d.el7.centos.1") + .setArchitecture("x86_64") + .build(); + assertEquals("2:docker-1.12.6-71.git3e8e77d.el7.centos.1.x86_64", yumPackage.toName()); + } @Test public void testAllValidFormats() { |