Fix Windows tests for PR targeting branches other than main (#6177)

* copy repo from ibmcloud instead of copying

Signed-off-by: anandrkskd <anandrkskd@gmail.com>

* suspend quarkus test

Signed-off-by: anandrkskd <anandrkskd@gmail.com>

* Speed up test execution on Windows with a shallow checkout instead of an 'scp'

'scp' happens to be a slow operation, because it is dependent on the network
and copies everything, including the full Git history checked out by the
IBM Cloud container.
The shallow clone/fetch allows to retrieve only the last commit in the
PR branch, rather than fetching the full Git history (which might take time
too).

Signed-off-by: anandrkskd <anandrkskd@gmail.com>
Co-authored-by: Armel Soro <asoro@redhat.com>
This commit is contained in:
Anand Kumar Singh
2022-10-03 14:06:19 +05:30
committed by GitHub
parent b333b08484
commit ae06ffc02b
2 changed files with 9 additions and 11 deletions

View File

@@ -18,20 +18,19 @@ function Do-Cleanup {
Shout "Removed $BUILD_NUMBER" Shout "Removed $BUILD_NUMBER"
Remove-Item -Force -Recurse $BUILD_NUMBER Remove-Item -Force -Recurse $BUILD_NUMBER
} }
} }
function Run-Test { function Run-Test {
Shout "kill previous odo sessions" Shout "kill previous odo sessions"
taskkill /IM "odo.exe" /F taskkill /IM "odo.exe" /F
Shout "Cloning Repo" Shout "Cloning Repo"
git clone $REPO $BUILD_NUMBER git clone --depth 1 $REPO $BUILD_NUMBER
Push-Location $BUILD_NUMBER Push-Location $BUILD_NUMBER
Shout "Checkout to $GIT_PR_NUMBER" Shout "Checking out PR #$GIT_PR_NUMBER"
git fetch -v origin pull/${GIT_PR_NUMBER}/head:pr${GIT_PR_NUMBER} git fetch --depth 1 origin pull/${GIT_PR_NUMBER}/head:pr${GIT_PR_NUMBER}
git checkout main git checkout pr${GIT_PR_NUMBER}
git merge pr${GIT_PR_NUMBER} --no-edit
Shout "Setup ENV variables" Shout "Setup ENV variables"
mkdir bin mkdir bin
@@ -100,8 +99,6 @@ $CLUSTER_ID=$args[6]
$TEST_EXEC_NODES=$args[7] $TEST_EXEC_NODES=$args[7]
Shout "Args Recived" Shout "Args Recived"
# Pre test cleanup
Do-Cleanup
# Run test # Run test
Run-Test Run-Test

View File

@@ -71,9 +71,10 @@ var _ = Describe("odo devfile supported tests", func() {
It("Verify output debug information for java-springboot works", func() { It("Verify output debug information for java-springboot works", func() {
createStarterProjAndSetDebug("java-springboot", "springbootproject") createStarterProjAndSetDebug("java-springboot", "springbootproject")
}) })
It("Verify output debug information for java-quarkus debug works", func() { // enable it once https://github.com/redhat-developer/odo/issues/6181 is solved
createStarterProjAndSetDebug("java-quarkus", "community") // It("Verify output debug information for java-quarkus debug works", func() {
}) // createStarterProjAndSetDebug("java-quarkus", "community")
// })
It("Verify output debug information for java-maven debug works", func() { It("Verify output debug information for java-maven debug works", func() {
createStarterProjAndSetDebug("java-maven", "springbootproject") createStarterProjAndSetDebug("java-maven", "springbootproject")
}) })