remove install MS Teams as teams now only available per PWA and not as package anymore
This commit is contained in:
parent
a71adfbdc4
commit
700132a163
6 changed files with 1 additions and 50 deletions
|
@ -60,7 +60,6 @@ After having installed `provs-desktop.jar` (see prerequisites) execute:
|
||||||
* `-o` for only executing one action, e.g.
|
* `-o` for only executing one action, e.g.
|
||||||
* `-o verify` for verifying your installation
|
* `-o verify` for verifying your installation
|
||||||
* `-o firefox` to install firefox from apt on ubuntu
|
* `-o firefox` to install firefox from apt on ubuntu
|
||||||
* `-o teams` to install MS-Teams
|
|
||||||
|
|
||||||
|
|
||||||
#### Example
|
#### Example
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
package org.domaindrivenarchitecture.provs.desktop.domain
|
package org.domaindrivenarchitecture.provs.desktop.domain
|
||||||
|
|
||||||
enum class DesktopOnlyModule {
|
enum class DesktopOnlyModule {
|
||||||
TEAMS, FIREFOX, VERIFY
|
FIREFOX, VERIFY
|
||||||
}
|
}
|
|
@ -90,15 +90,6 @@ fun Prov.provisionIdeDesktop(onlyModules: List<String>? = null) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Suppress("unused") // used in other projects
|
|
||||||
fun Prov.provisionMSDesktop(onlyModules: List<String>?) {
|
|
||||||
if (onlyModules == null) {
|
|
||||||
installMsTeams()
|
|
||||||
} else if (onlyModules.contains(DesktopOnlyModule.TEAMS.name.lowercase())) {
|
|
||||||
installMsTeams()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun Prov.provisionOfficeDesktop(onlyModules: List<String>? = null) {
|
fun Prov.provisionOfficeDesktop(onlyModules: List<String>? = null) {
|
||||||
if (onlyModules == null) {
|
if (onlyModules == null) {
|
||||||
aptInstall(ZIP_UTILS)
|
aptInstall(ZIP_UTILS)
|
||||||
|
|
|
@ -1,12 +0,0 @@
|
||||||
package org.domaindrivenarchitecture.provs.desktop.infrastructure
|
|
||||||
|
|
||||||
import org.domaindrivenarchitecture.provs.framework.core.Prov
|
|
||||||
import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
|
|
||||||
|
|
||||||
fun Prov.installMsTeams() = task {
|
|
||||||
aptInstall("curl gnupg2")
|
|
||||||
cmd("curl -sSL https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -")
|
|
||||||
cmd("sudo sh -c 'echo \"deb [arch=amd64] https://packages.microsoft.com/repos/ms-teams stable main\" > /etc/apt/sources.list.d/teams.list'")
|
|
||||||
cmd("sudo apt-get update") // apt needs update
|
|
||||||
aptInstall("teams")
|
|
||||||
}
|
|
|
@ -14,13 +14,4 @@ internal class CliArgumentsParserTest {
|
||||||
assertEquals(null, cli.configFile)
|
assertEquals(null, cli.configFile)
|
||||||
assertEquals(true, cli.target.isValidLocalhost())
|
assertEquals(true, cli.target.isValidLocalhost())
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
|
||||||
fun parse_cliCommand_with_onlyModule_teams_and_local_target() {
|
|
||||||
val cli = CliArgumentsParser("test").parseCommand(args = arrayOf("ide", "local", "-o", "teams"))
|
|
||||||
|
|
||||||
assertTrue(cli.isValid())
|
|
||||||
assertEquals(true, cli.target.isValidLocalhost())
|
|
||||||
assertEquals(true, cli.onlyModules?.contains("teams"))
|
|
||||||
}
|
|
||||||
}
|
}
|
|
@ -1,18 +0,0 @@
|
||||||
package org.domaindrivenarchitecture.provs.desktop.infrastructure
|
|
||||||
|
|
||||||
import org.domaindrivenarchitecture.provs.test.defaultTestContainer
|
|
||||||
import org.domaindrivenarchitecture.provs.test.tags.ExtensiveContainerTest
|
|
||||||
import org.junit.jupiter.api.Assertions.assertTrue
|
|
||||||
|
|
||||||
class MsTeamsKtTest {
|
|
||||||
|
|
||||||
@ExtensiveContainerTest
|
|
||||||
fun installMsTeams() {
|
|
||||||
// given
|
|
||||||
val a = defaultTestContainer()
|
|
||||||
// when
|
|
||||||
val res = a.task { installMsTeams() }
|
|
||||||
// then
|
|
||||||
assertTrue(res.success)
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in a new issue