Skip to content

Commit

Permalink
Merge pull request #8 from macstadium/spasov/rename-plugin
Browse files Browse the repository at this point in the history
Rename plugin
  • Loading branch information
ispasov authored Jan 14, 2020
2 parents 047e4cf + 9aafcd0 commit 4efcaac
Show file tree
Hide file tree
Showing 51 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ To build the plugin, run:

./gradlew build

This runs [checkstyle][checkstyle] validation and builds the plugin. The output is in `orka-teamcity-plugin-server/build/distributuons/`.
This runs [checkstyle][checkstyle] validation and builds the plugin. The output is in `macstadium-orka-server/build/distributuons/`.

To run tests, run:

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ teamcity {
}

dependencies {
compile project(":orka-teamcity-plugin-common")
compile project(":macstadium-orka-common")
provided "org.jetbrains.teamcity:agent-api:$teamcityVersion"
provided "org.jetbrains.teamcity:cloud-interface:$teamcityVersion"
provided "org.jetbrains.teamcity:cloud-shared:$teamcityVersion"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ teamcity {
}

dependencies {
agent project(path: ':orka-teamcity-plugin-agent', configuration: 'plugin')
server project(':orka-teamcity-plugin-common')
provided project(":orka-teamcity-plugin-common")
agent project(path: ':macstadium-orka-agent', configuration: 'plugin')
server project(':macstadium-orka-common')
provided project(":macstadium-orka-common")

compile "com.squareup.okhttp3:okhttp:3.14.2"
compile "com.google.code.gson:gson:2.8.5"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<teamcity-plugin xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:schemas-jetbrains-com:teamcity-plugin-v1-xml">
<info>
<name>orka-teamcity-plugin</name>
<display-name>orka-teamcity-plugin</display-name>
<name>macstadium-orka</name>
<display-name>Orka by MacStadium</display-name>
<version>@Version@</version>
<description>This is a TeamCity plugin to support cloud agents on Orka by MacStadium</description>
<email>ivan@st6.io</email>
Expand Down
8 changes: 4 additions & 4 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
rootProject.name = 'orka-teamcity-plugin'
include(':orka-teamcity-plugin-server')
include(':orka-teamcity-plugin-agent')
include(':orka-teamcity-plugin-common')
rootProject.name = 'macstadium-orka'
include(':macstadium-orka-server')
include(':macstadium-orka-agent')
include(':macstadium-orka-common')
4 changes: 2 additions & 2 deletions wiki/setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ The plugin allows you to configure TeamCity, so it can spin up on demand ephemer
1. [Install](#set-up-an-orka-vm-base-image) the Orka TeamCity plugin.
2. Set up an Orka VM [base image](#set-up-an-orka-vm-base-image). The image must have SSH enabled.
3. Set up an Orka [VM configuration](#set-up-an-orka-vm-config-for-the-ephemeral-agents) using the base image from **Step 2**. The Orka VM config is the container template that the plugin will use to spin up ephemeral Mac machines.
4. Set up а TeamCity [cloud profile](usage.md#configure-the-orka-teamcity-plugin).
4. Set up а TeamCity [cloud profile](usage.md#configure-the-macstadium-orka-plugin).

## Install the Orka TeamCity Plugin

Expand All @@ -30,7 +30,7 @@ The Orka VM base image is used when the Orka plugin spins up ephemeral TeamCity
1. Set up a new Orka VM. You can set up an Orka VM using the Orka [CLI][cli] or [REST API][api]. For more information, see the Orka [quick start guide][quick-start].
2. Connect to the Orka VM using SSH or VNC.
3. Verify the TeamCity build agent is installed. For more information, see [here][build-agent-install].
**Note** Make sure to note down the installation directory for the build agent. You will need it later to configure a [TeamCity cloud profile](usage.md#configure-the-orka-teamcity-plugin).
**Note** Make sure to note down the installation directory for the build agent. You will need it later to configure a [TeamCity cloud profile](usage.md#configure-the-macstadium-orka-plugin).
4. Start the agent manually, by running `<installation path>/bin/agent.sh start` on the VM.
5. Verify the build agent is up to date. This ensures faster startup of the build agent. To do that:
- In your TeamCity server go to `Agents` -> `Pools`.
Expand Down
4 changes: 2 additions & 2 deletions wiki/usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The plugin allows you to configure TeamCity, so it can spin up on demand ephemer

How to set up the plugin, see [here](setup.md).

## Configure the Orka TeamCity plugin
## Configure the MacStadium Orka plugin

The plugin allows you to configure a cloud profile per project.

Expand All @@ -30,7 +30,7 @@ In your TeamCity server:

**NOTE** `Agent Push` is not supported.

## Using the Orka TeamCity plugin
## Using the MacStadium Orka plugin

Once the cloud profile is successfully configured, TeamCity will automatically spin up and destroy agents in the respective orka environment.

Expand Down

0 comments on commit 4efcaac

Please sign in to comment.