diff --git a/.github/workflows/blossom-ci.yml b/.github/workflows/blossom-ci.yml index 222ce3e1dd7..70019774657 100644 --- a/.github/workflows/blossom-ci.yml +++ b/.github/workflows/blossom-ci.yml @@ -40,7 +40,7 @@ jobs: id: pull_request_data uses: octokit/request-action@v2.x with: - route: GET /repos/:repository/pulls/:issue_id + route: 'GET /repos/:repository/pulls/:issue_id' repository: ${{ github.repository }} issue_id: ${{ github.event.issue.number }} env: @@ -53,7 +53,7 @@ jobs: - name: Update status uses: octokit/request-action@v2.x with: - route: POST /repos/:repository/statuses/:sha + route: 'POST /repos/:repository/statuses/:sha' repository: ${{ github.repository }} sha: ${{ fromJson(steps.pull_request_data.outputs.data).head.sha }} target_url: "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" @@ -75,8 +75,9 @@ jobs: with: java-version: 1.8 - - name: Maven install - run: mvn clean install -DskipTests -T 1.5C + - name: Get project data (maven) + run: | + echo ::set-env name=projects::$(mvn -am dependency:tree | grep maven-dependency-plugin | awk '{ out="com.nvidia:"$(NF-1);print out }' | grep rapids | xargs | sed -e 's/ /,/g') - name: Add mask run: echo "::add-mask::${{ secrets.BLACKDUCK_URL }}" @@ -90,6 +91,7 @@ jobs: args: > --blackduck.url="https://${{ secrets.BLACKDUCK_URL }}" --blackduck.api.token="${{ secrets.BLACKDUCK_API_TOKEN }}" + --detect.maven.build.command="-pl='$PROJECTS -am'" --detect.force.success=false --detect.parallel.processors=0 --detect.project.name="${{ github.repository }}" diff --git a/jenkins/Jenkinsfile-blossom.premerge b/jenkins/Jenkinsfile-blossom.premerge index 6d3e85791d8..7f36c3f3e04 100644 --- a/jenkins/Jenkinsfile-blossom.premerge +++ b/jenkins/Jenkinsfile-blossom.premerge @@ -40,6 +40,9 @@ spec: requests: cpu: 4 memory: 8Gi + limits: + cpu: 8 + memory: 16Gi env: - name: DOCKER_HOST value: tcp://localhost:2375 @@ -67,6 +70,8 @@ spec: cpu: 8 memory: 16Gi limits: + cpu: 16 + memory: 32Gi nvidia.com/gpu: 1 restartPolicy: Never backoffLimit: 2 @@ -114,7 +119,7 @@ pipeline { LIBCUDF_KERNEL_CACHE_PATH = '/tmp/.cudf' ARTIFACTORY_NAME = "${ArtifactoryConstants.ARTIFACTORY_NAME}" GITHUB_TOKEN = credentials("github-token") - // TODO: rename this credential after we shutdown premerge pipine on ngcc + // TODO: rename this credential after we shutdown premerge pipeline on ngcc URM_CREDS = credentials("svcngcc_artifactory") URM_URL = "https://${ArtifactoryConstants.ARTIFACTORY_NAME}/artifactory/sw-spark-maven" }