Revert/replace some of the previous changes

(cherry picked from commit 177ab7d221)
This commit is contained in:
alandavis
2021-05-05 21:17:29 +01:00
parent 1f9e4fb4f6
commit 58d361b792

View File

@@ -122,7 +122,7 @@ function buildUpstreamTag() {
cd "$(basename "${UPSTREAM_REPO%.git}")" cd "$(basename "${UPSTREAM_REPO%.git}")"
mvn -B -V clean package -DskipTests -Dmaven.javadoc.skip=true "-Dimage.tag=${TAG}" -Pags ${EXTRA_BUILD_ARGUMENTS} mvn -B -V clean package -DskipTests -Dmaven.javadoc.skip=true "-Dimage.tag=${TAG}" ${EXTRA_BUILD_ARGUMENTS}
popd popd
} }
@@ -135,8 +135,8 @@ function buildSameBranchOnUpstream() {
cd "$(basename "${UPSTREAM_REPO%.git}")" cd "$(basename "${UPSTREAM_REPO%.git}")"
mvn -B -V -q clean install -DskipTests -Dmaven.javadoc.skip=true -Pags ${EXTRA_BUILD_ARGUMENTS} mvn -B -V -q clean install -DskipTests -Dmaven.javadoc.skip=true ${EXTRA_BUILD_ARGUMENTS}
mvn -B -V -q install -DskipTests -Pags -f packaging/tests/pom.xml mvn -B -V -q install -DskipTests -f packaging/tests/pom.xml
popd popd
} }
@@ -152,7 +152,7 @@ function pullUpstreamTagAndBuildDockerImage() {
cd "$(basename "${UPSTREAM_REPO%.git}")" cd "$(basename "${UPSTREAM_REPO%.git}")"
mvn -B -V clean package -DskipTests -Dmaven.javadoc.skip=true "-Dimage.tag=${TAG}" -Pags ${EXTRA_BUILD_ARGUMENTS} mvn -B -V clean package -DskipTests -Dmaven.javadoc.skip=true "-Dimage.tag=${TAG}" ${EXTRA_BUILD_ARGUMENTS}
popd popd
} }
@@ -169,8 +169,8 @@ function pullAndBuildSameBranchOnUpstream() {
cd "$(basename "${UPSTREAM_REPO%.git}")" cd "$(basename "${UPSTREAM_REPO%.git}")"
mvn -B -V -q clean install -DskipTests -Dmaven.javadoc.skip=true -Pags ${EXTRA_BUILD_ARGUMENTS} mvn -B -V -q clean install -DskipTests -Dmaven.javadoc.skip=true ${EXTRA_BUILD_ARGUMENTS}
mvn -B -V -q install -DskipTests -Pags -f packaging/tests/pom.xml mvn -B -V -q install -DskipTests -f packaging/tests/pom.xml
popd popd
} }