Merge remote-tracking branch 'upstream/main'

.github/workflows/groovy-tests.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: Run Tests
         run: |
-          ./gradlew test --info --tests=TestCloseGithubIssue
+          ./gradlew test --info
       - name: Upload Coverage Report
         uses: codecov/[email protected]
         with:

tests/jenkins/TestCloseBuildSuccessGithubIssue.groovy

@@ -27,7 +27,7 @@ class TestCloseBuildSuccessGithubIssue extends BuildPipelineTest {
 
     @Test
     public void testExistingGithubIssue() {
-        super.testPipeline('tests/jenkins/jobs/CloseBuildSuccessGithubIssue_Jenkinsfile')
+        super.testPipeline('tests/jenkins/jobs/CloseBuildSuccessGithubIssue_JenkinsFile')
         assertThat(getCommands('sh', 'script'), hasItem("{script=gh issue list --repo https://github.com/opensearch-project/OpenSearch.git -S \"[AUTOCUT] Distribution Build Failed for OpenSearch-2.0.0 in:title\" --label autocut,v2.0.0 --json number --jq '.[0].number', returnStdout=true}"))
         assertThat(getCommands('sh', 'script'), hasItem("{script=gh issue close bbb\nccc -R opensearch-project/OpenSearch --comment \"Closing the issue as the distribution build for OpenSearch has passed for version: **2.0.0**.\n                    Please see build log at www.example.com/jobs/test/123/consoleFull\", returnStdout=true}"))
     }

tests/jenkins/TestCloseGithubIssue.groovy

@@ -33,8 +33,8 @@ class TestCloseGithubIssue extends BuildPipelineTest {
             'label101',
             ))
         super.testPipeline("tests/jenkins/jobs/CloseGithubIssue_JenkinsFile")
-        // assertThat(getCommands('sh', 'script'), hasItem("{script=gh issue list --repo https://github.com/opensearch-project/opensearch-build -S \"Test GH issue title in:title\" --label label101 --json number --jq '.[0].number', returnStdout=true}"))
-        // assertThat(getCommands('sh', 'script'), hasItem("{script=gh issue close bbb\nccc -R opensearch-project/opensearch-build --comment \"Test GH issue close comment\", returnStdout=true}"))
+        assertThat(getCommands('sh', 'script'), hasItem("{script=gh issue list --repo https://github.com/opensearch-project/opensearch-build -S \"Test GH issue title in:title\" --label label101 --json number --jq '.[0].number', returnStdout=true}"))
+        assertThat(getCommands('sh', 'script'), hasItem("{script=gh issue close bbb\nccc -R opensearch-project/opensearch-build --comment \"Test GH issue close comment\", returnStdout=true}"))
     }
 
     def getCommands(method, text) {

tests/jenkins/jobs/RunGradleCheck_Jenkinsfile.txt

@@ -37,11 +37,11 @@
                 ./gradlew --stop
                 rm -rf ~/.gradle
 
-                if ! (uname -s | grep -i NT); then
+                if command -v docker > /dev/null; then
                     echo "Check existing dockercontainer"
                     docker ps -a
                     docker stop `docker ps -qa` > /dev/null 2>&1 || echo
-                    docker rm `docker ps -qa` > /dev/null 2>&1 || echo
+                    docker rm --force `docker ps -qa` > /dev/null 2>&1 || echo
                     echo "Stop existing dockercontainer"
                     docker ps -a
 

vars/runGradleCheck.groovy

@@ -51,11 +51,11 @@ void call(Map args = [:]) {
                 ./gradlew --stop
                 rm -rf ~/.gradle
 
-                if ! (uname -s | grep -i NT); then
+                if command -v docker > /dev/null; then
                     echo "Check existing dockercontainer"
                     docker ps -a
                     docker stop `docker ps -qa` > /dev/null 2>&1 || echo
-                    docker rm `docker ps -qa` > /dev/null 2>&1 || echo
+                    docker rm --force `docker ps -qa` > /dev/null 2>&1 || echo
                     echo "Stop existing dockercontainer"
                     docker ps -a