Skip to content

Commit

Permalink
CI SCRIPT: Updated to jbosstm/jboss-as 5_9_BRANCH and to wildfly/18.0…
Browse files Browse the repository at this point in the history
….x branch
  • Loading branch information
tomjenkinson committed Jul 8, 2020
1 parent 33f0e29 commit b97d085
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions scripts/hudson/narayana.sh
Original file line number Diff line number Diff line change
Expand Up @@ -336,19 +336,19 @@ function build_as {
fi
#Abort any partially complete rebase
git rebase --abort
git checkout 5_BRANCH
[ $? = 0 ] || fatal "git checkout 5_BRANCH failed"
git checkout 5_9_BRANCH
[ $? = 0 ] || fatal "git checkout 5_9_BRANCH failed"
git fetch
[ $? = 0 ] || fatal "git fetch git://github.com/jbosstm/jboss-as.git failed"
git reset --hard jbosstm/5_BRANCH
[ $? = 0 ] || fatal "git reset 5_BRANCH failed"
git reset --hard jbosstm/5_9_BRANCH
[ $? = 0 ] || fatal "git reset 5_9_BRANCH failed"
git clean -f -d -x
[ $? > 1 ] || fatal "git clean failed"
git rebase --abort
rm -rf .git/rebase-apply
else
echo "First time checkout of AS7"
git clone git://github.com/jbosstm/jboss-as.git -o jbosstm
git clone git://github.com/jbosstm/jboss-as.git -b 5_9_BRANCH -o jbosstm
[ $? = 0 ] || fatal "git clone git://github.com/jbosstm/jboss-as.git failed"

cd jboss-as
Expand All @@ -364,9 +364,9 @@ function build_as {

git fetch upstream
echo "This is the JBoss-AS commit"
echo $(git rev-parse upstream/master)
echo $(git rev-parse upstream/18.0.x)

git pull --rebase --ff-only upstream master
git pull --rebase --ff-only upstream 18.0.x
[ $? = 0 ] || fatal "git rebase failed"

if [ $REDUCE_SPACE = 1 ]; then
Expand Down

0 comments on commit b97d085

Please sign in to comment.