[GHA] Re-introduced environment variables

[jmfinelli]

CORE JDK21

AS_BRANCH=testcontainer

[jmfinelli]

Note: I noticed that the log messages that use AS_BRANCH are a bit sloppy:

    [ -z "$AS_BRANCH" ] || git fetch jbosstm +refs/pull/*/head:refs/remotes/jbosstm/pull/*/head
    [ $? -eq 0 ] || fatal "git fetch of pulls failed"
    [ -z "$AS_BRANCH" ] || git checkout $AS_BRANCH
    [ $? -eq 0 ] || fatal "git fetch of pull branch failed"
    [ -z "$AS_BRANCH" ] || echo "Using non-default AS_BRANCH: $AS_BRANCH"
    if [ -n "$AS_BRANCH" ] && [ -n "$NARAYANA_FORK_BRANCH_TO_REBASE_ON" ]; then
        git pull --rebase jbosstm "$NARAYANA_FORK_BRANCH_TO_REBASE_ON" \
            && echo "Rebased AS_BRANCH on jbosstm/jboss-as $NARAYANA_FORK_BRANCH_TO_REBASE_ON" \
            || fatal "git pull --rebase failed"
    fi

    git fetch upstream
    echo "This is the JBoss-AS commit"
    echo $(git rev-parse upstream/main)
    echo "This is the AS_BRANCH $AS_BRANCH commit"
    echo $(git rev-parse HEAD)

    echo "Rebasing the wildfly upstream/main on top of the AS_BRANCH $AS_BRANCH"
    git pull --rebase upstream main
    [ $? -eq 0 ] || fatal "git rebase failed"

For example, echo "Rebasing the wildfly upstream/main on top of the AS_BRANCH $AS_BRANCH" is not super clear when AS_BRANCH is not set. Same for [ -z "$AS_BRANCH" ] || echo "Using non-default AS_BRANCH: $AS_BRANCH". If you guys agree, we can improve those messages.

[tomjenkinson]

I do think we should change a few of them as follows:

echo "This is the AS_BRANCH $AS_BRANCH commit"

This is the as revision:

echo "Rebasing the wildfly upstream/main on top of the AS_BRANCH $AS_BRANCH"

Rebasing the wildfly revision on upstream main

Do you agree? I would be happy to raise a pull request.

[jmfinelli]

I do think we should change a few of them as follows:

echo "This is the AS_BRANCH $AS_BRANCH commit"

This is the as revision:

echo "Rebasing the wildfly upstream/main on top of the AS_BRANCH $AS_BRANCH"

Rebasing the wildfly revision on upstream main

Do you agree? I would be happy to raise a pull request.

Yep, agree :-) Thanks Tom

[tomjenkinson]

I do think we should change a few of them as follows:

echo "This is the AS_BRANCH $AS_BRANCH commit"

This is the as revision:

echo "Rebasing the wildfly upstream/main on top of the AS_BRANCH $AS_BRANCH"

Rebasing the wildfly revision on upstream main
Do you agree? I would be happy to raise a pull request.

Yep, agree :-) Thanks Tom

I'll raise it then - thank you!