Skip to content

Commit

Permalink
Update README and configuration file (#115)
Browse files Browse the repository at this point in the history
Signed-off-by: Maayan Hadasi <mguetta@redhat.com>
  • Loading branch information
mguetta1 committed May 2, 2024
1 parent 3a1bb74 commit 539b876
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 5 deletions.
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ VENDOR_DIR ?= /tmp/konveyor-vendor
ARCH ?= amd64
JUNIT_REPORT_DIR ?= /tmp/junit-report

# Set MAVEN_TESTAPP_USER to the value of GITHUB_USER if GITHUB_USER is defined
MAVEN_TESTAPP_USER ?= $(GITHUB_USER)
MAVEN_TESTAPP_TOKEN ?= $(GITHUB_TOKEN)


# Setup local minikube with tackle - work in progress (TODO: enable auth)
# This is for local setup, CI uses shared github actions
Expand Down Expand Up @@ -44,7 +48,7 @@ test-tier2:

# TIER3
test-tier3:
TIER3=1 MAVEN_TESTAPP_USER=$(GITHUB_USER) MAVEN_TESTAPP_TOKEN=$(GITHUB_TOKEN) $(MAKE) test-analysis
TIER3=1 MAVEN_TESTAPP_USER='$(MAVEN_TESTAPP_USER)' MAVEN_TESTAPP_TOKEN='$(MAVEN_TESTAPP_TOKEN)' $(MAKE) test-analysis
$(MAKE) test-jira
$(MAKE) test-migrationwave

Expand Down
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,11 @@ For parallel test execution, set `export PARALLEL=1`.
## Configuration

> **_NOTE:_** Before running tests, ensure that the required configuration variables are set as environment variables
<!-- TODO (mguetta1): add config file for example -->
You can edit the configuration file [go-konveyor-tests.config](go-konveyor-tests.config) and run:
```
source go-konveyor-tests.config
```

### Test-Specific Configuration

Expand Down
8 changes: 7 additions & 1 deletion analysis/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,18 @@ TIER1=1 make test-analysis

More advanced analysis parameters. Great if works.

Test cases: https://github.com/konveyor/go-konveyor-tests/blob/main/analysis/test_cases.go#L20
Test cases: https://github.com/konveyor/go-konveyor-tests/blob/main/analysis/test_cases.go#L19

```
TIER2=1 make test-analysis
```

### Tier 3

Application analysis with credentials, which are supplied as part of the test configuration. Should work.

Test cases: https://github.com/konveyor/go-konveyor-tests/blob/main/analysis/test_cases.go#L31

## Options

[HUB_BASE_URL](https://github.com/konveyor/tackle2-hub/tree/main/test#rest-api) is required in the same way as in API test.
Expand Down
4 changes: 2 additions & 2 deletions analysis/test_cases.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ var Tier2TestCases = []TC{
SeamBooking,
}

// Tier 3 Analysis test cases - should work
// Tier 3 Analysis with credentials test cases - should work
// List of applications with expected analysis outputs.
var Tier3TestCases = []TC{
TackleTestappPrivateBinary,
TackleTestappPrivateBinary, // Needs GITHUB_USER and GITHUB_TOKEN env variables with Read access to https://github.com/konveyor/tackle-testapp
}
18 changes: 18 additions & 0 deletions go-konveyor-tests.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/bin/bash
export KUBECONFIG=""
export HUB_BASE_URL=""
export HUB_PASSWORD=""
export HUB_USERNAME=""

# Enviroment variebles needed for e2e/jiraintegration and e2e/migrationwave tests
export JIRA_CLOUD_USERNAME=""
export JIRA_CLOUD_PASSWORD=""
export JIRA_CLOUD_URL=""
export JIRA_SERVER_URL=""
export JIRA_SERVER_USERNAME=""
export JIRA_SERVER_PASSWORD=""
export JIRA_SERVER_TOKEN=""

# Enviroment variebles needed for Tier3 Analysis test
export GITHUB_USER=""
export GITHUB_TOKEN=""

0 comments on commit 539b876

Please sign in to comment.