Use credentials to load GSKit binaries from Artifactory

[KostasTsiounis]

This allows the GSKit binaries to be downloaded from Artifactory, using the appropriate credentials, during the OpenJDK build process.

Signed-off by: Kostas Tsiounis [email protected]

[AdamBrousseau]

While we're here, is it wise to clean this code up a bit?
I'm wondering if we can move the get_source line to a new function so we don't have to repeat it 4 times. Can a similar thing be done for the gskit creds bit too? 🤔

[KostasTsiounis]

I can move the whole if-else block into a function to avoid doing it twice. However, I think I need to make separate calls with and without -gskit-credentials. I tried just adding it to the EXTRA_GETSOURCE_OPTIONS variable, or assigning it to its own variable, and then calling the get_source line separately, but even though it works, it seems to be printing the token to the console, which I don't think is the way to go.

@AdamBrousseau If you have a way to circumvent that, I'd be more than willing to give it a try. Otherwise, I can just move the whole new block into a method.

[AdamBrousseau]

Does this work for the get_source line?

if (EXTRA_GETSOURCE_OPTIONS.contains("-gskit-bin") || (EXTRA_CONFIGURE_OPTIONS.contains("-gskit-sdk-bin"))) {
        gskitCredentialID = variableFile.get_user_credentials_id('gskit')
        withCredentials([usernamePassword(credentialsId: "${gskitCredentialID}", passwordVariable: 'GSKIT_PASSWORD', usernameVariable: 'GSKIT_USERNAME')]) {
            get_source_call("-gskit-credential=\$GSKIT_USERNAME:\$GSKIT_PASSWORD")
        }
    } else {
        get_source_call()
    }

def get_source_call(gskit_cred="") {
    sh "bash get_source.sh ${EXTRA_GETSOURCE_OPTIONS} ${gskit_cred} ${OPENJ9_REPO_OPTION} ${OPENJ9_BRANCH_OPTION} ${OPENJ9_SHA_OPTION} ${OPENJ9_REFERENCE} ${OMR_REPO_OPTION} ${OMR_BRANCH_OPTION} ${OMR_SHA_OPTION} ${OMR_REFERENCE}"
}

Or is that what you tried when you said it was printing the creds to the console?

[KostasTsiounis]

I tried the following:

if (EXTRA_GETSOURCE_OPTIONS.contains("-gskit-bin") || (EXTRA_CONFIGURE_OPTIONS.contains("-gskit-sdk-bin"))) {
        gskitCredentialID = variableFile.get_user_credentials_id('gskit')
        withCredentials([usernamePassword(credentialsId: "${gskitCredentialID}", passwordVariable: 'GSKIT_PASSWORD', usernameVariable: 'GSKIT_USERNAME')]) {
            EXTRA_GETSOURCE_OPTIONS += " -gskit-credential=\$GSKIT_USERNAME:\$GSKIT_PASSWORD"
        }
    } 

sh "bash get_source.sh ${EXTRA_GETSOURCE_OPTIONS} ${OPENJ9_REPO_OPTION} ${OPENJ9_BRANCH_OPTION} ${OPENJ9_SHA_OPTION} ${OPENJ9_REFERENCE} ${OMR_REPO_OPTION} ${OMR_BRANCH_OPTION} ${OMR_SHA_OPTION} ${OMR_REFERENCE}"

Which wouldn't pass the credentials at all. And then I changed the line to:
EXTRA_GETSOURCE_OPTIONS += " -gskit-credential=${GSKIT_USERNAME}:${GSKIT_PASSWORD}"

That worked, but was printing the credentials.

[AdamBrousseau]

Ok. Well let's not waste too much time on it. The code doesn't change that often.

[AdamBrousseau]

jenkins compile amac jdk17

[AdamBrousseau]

jenkins compile amac jdk17

[AdamBrousseau]

Looks good. Thanks for getting the code refactored.
PR build passed and internal build passed (Build_JDK17_x86-64_linux_Personal/1825 & 1826).