Skip to content

Commit

Permalink
Remove tests that use the SEM manager (#204)
Browse files Browse the repository at this point in the history
## Why?
See galasa-dev/projectmanagement#1749

Now that the tests that use the SEM manager have been moved to run
internally, these tests are no longer needed in the open source
repository.

## Changes
- Removed tests that use the SEM manager
- Bumped inttests to 0.38.0
- Bumped the Galasa BOM being used to 0.38.0
- Bumped gson to 2.10.1 to be consistent with the rest of the Galasa
codebase
- Minor tweaks to the build-locally script to stop it from attempting to
publish artifacts unnecessarily
  • Loading branch information
eamansour authored Sep 26, 2024
2 parents a8aeacc + 826ff77 commit 1c39c77
Show file tree
Hide file tree
Showing 21 changed files with 15 additions and 913 deletions.
23 changes: 9 additions & 14 deletions build-locally.sh
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,6 @@ else
info "Over-ridden by caller using the LOGS_DIR variable."
fi

info "Using source code at ${source_dir}"
cd ${BASEDIR}/${source_dir}
if [[ "${DEBUG}" == "1" ]]; then
OPTIONAL_DEBUG_FLAG="-debug"
else
Expand All @@ -118,16 +116,17 @@ info "Log will be placed at ${log_file}"

function gradle_build {
h2 "Building using Gradle..."

context=inttests/galasa-inttests-parent

info "Using source code at ${source_dir}"
cd ${BASEDIR}/${source_dir}

cmd="gradle --build-cache --parallel \
${CONSOLE_FLAG} \
--warning-mode=all \
-Dorg.gradle.java.home=${JAVA_HOME} \
-PsourceMaven=https://development.galasa.dev/main/maven-repo/obr ${OPTIONAL_DEBUG_FLAG} \
-PcentralMaven=https://repo.maven.apache.org/maven2/ \
publish publishToMavenLocal \
build publishToMavenLocal \
"

info "Using this command: $cmd"
Expand All @@ -136,8 +135,8 @@ function gradle_build {
success "Built OK"
}

function publish_artifacts {
h2 "Publishing using Maven..."
function build_obr {
h2 "Building OBR using Maven..."
cd ${BASEDIR}/galasa-inttests-parent/dev.galasa.inttests.obr

context=inttests/galasa-inttests-parent/dev.galasa.inttests.obr
Expand All @@ -146,19 +145,15 @@ function publish_artifacts {
cmd="mvn \
-Dgalasa.source.repo=https://development.galasa.dev/main/maven-repo/obr \
-Dgalasa.central.repo=https://repo.maven.apache.org/maven2/ \
-Dgalasa.release.repo=file://$BASEDIR/temp \
-Dgalasa.bootstrap=${bootstrap} \
-Dgalasa.skip.deploytestcatalog=true \
-Dgalasa.skip.bundletestcatalog=false \
deploy dev.galasa:galasa-maven-plugin:deploytestcat \
install
"

info "Using this command: $cmd"
$cmd 2>&1 >> ${log_file}
rc=$? ; if [[ "${rc}" != "0" ]]; then error "Failed to build ${project} log is at ${log_file}" ; exit 1 ; fi
success "Published to '${bootstrap}' OK"
success "Built OBR OK"
}

mkdir -p $BASEDIR/temp
gradle_build
publish_artifacts
build_obr
5 changes: 1 addition & 4 deletions galasa-inttests-parent/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ subprojects {
// }

dependencies {
implementation platform('dev.galasa:galasa-bom:0.36.0')
implementation platform('dev.galasa:galasa-bom:0.38.0')

compileOnly 'dev.galasa:dev.galasa'
compileOnly 'dev.galasa:dev.galasa.framework'
Expand All @@ -104,9 +104,6 @@ subprojects {
compileOnly 'dev.galasa:dev.galasa.java.manager'
compileOnly 'dev.galasa:dev.galasa.java.ubuntu.manager'
compileOnly 'dev.galasa:dev.galasa.java.windows.manager'
compileOnly 'dev.galasa:dev.galasa.sem.manager'
compileOnly 'dev.galasa:dev.galasa.cicsts.manager'
compileOnly 'dev.galasa:dev.galasa.sdv.manager'
compileOnly 'dev.galasa:dev.galasa.zosprogram.manager'
compileOnly 'dev.galasa:dev.galasa.githubissue.manager'
compileOnly 'commons-logging:commons-logging:1.2'
Expand Down
4 changes: 2 additions & 2 deletions galasa-inttests-parent/dev.galasa.inttests.obr/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>dev.galasa</groupId>
<artifactId>dev.galasa.inttests.obr</artifactId>
<version>0.36.0</version>
<version>0.38.0</version>
<packaging>galasa-obr</packaging>

<properties>
Expand All @@ -25,7 +25,7 @@
<dependency>
<groupId>dev.galasa</groupId>
<artifactId>dev.galasa.inttests</artifactId>
<version>0.36.0</version>
<version>0.38.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
6 changes: 2 additions & 4 deletions galasa-inttests-parent/dev.galasa.inttests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@ plugins {

description = 'Galasa Integration Tests'

version = '0.36.0'
version = '0.38.0'

dependencies {
implementation platform('dev.galasa:galasa-bom:0.36.0')

implementation 'com.google.code.gson:gson:2.8.5'
implementation 'com.google.code.gson:gson:2.10.1'
implementation 'commons-io:commons-io:2.9.0'
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 1c39c77

Please sign in to comment.