diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index ac839cc58f..0000000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: PR and master push checks - -on: - push: - branches: [ "develop" ] - pull_request: - branches: - - "develop" - - "feature/*" - - "bugfix/*" - - "ADH-*" - -jobs: - build: - strategy: - matrix: - hdfs-version: [ 3.3 ] - runs-on: ubuntu-latest - name: Build with HDFS ${{ matrix.hdfs-version }} - steps: - - uses: actions/checkout@v3 - - - name: Set up JDK 8 - uses: actions/setup-java@v3 - with: - java-version: '8' - distribution: 'temurin' - cache: maven - - - name: Build with Maven - run: sh ./build-project.sh ${{ matrix.hdfs-version }} - - - name: Run unit tests - run: mvn test -Dmaven.test.redirectTestOutputToFile=false -Phadoop-${{ matrix.hdfs-version }} - - - name: Run integration tests - run: mvn test -Dmaven.test.redirectTestOutputToFile=false -Pit-tests -f smart-integration/pom.xml - -# Can't run test containers due to inaccessibility of cloud-hub.adsw.io github -# - name: Run UI tests -# run: mvn verify -Pweb-tests -pl smart-tests \ No newline at end of file diff --git a/build-project.sh b/build-project.sh index 037313482d..1ac4e7577f 100755 --- a/build-project.sh +++ b/build-project.sh @@ -3,5 +3,4 @@ set -e HDFS_VERSION=$1 -mvn install:install-file -pl smart-tests mvn clean install -Pdist,web-ui,hadoop-"${HDFS_VERSION}" -DskipTests \ No newline at end of file diff --git a/pom.xml b/pom.xml index a8c878aa7d..113258e969 100644 --- a/pom.xml +++ b/pom.xml @@ -40,6 +40,17 @@ SmartData Project pom + + + maven-arenadata-snapshot + https://nexus.adsw.io/repository/maven-arenadata-snapshot/ + + + maven-arenadata-release + https://nexus.adsw.io/repository/maven-arenadata-release/ + + + smart-frontend smart-common diff --git a/smart-tests/lib/java-test-common-jdk8-1.13-jdk8.jar b/smart-tests/lib/java-test-common-jdk8-1.13-jdk8.jar deleted file mode 100644 index 85bc3d41f3..0000000000 Binary files a/smart-tests/lib/java-test-common-jdk8-1.13-jdk8.jar and /dev/null differ diff --git a/smart-tests/pom.xml b/smart-tests/pom.xml index 041b2afd2f..b3c96139c3 100644 --- a/smart-tests/pom.xml +++ b/smart-tests/pom.xml @@ -51,21 +51,11 @@ org.smartdata.client.generated 1.6.0 - - - - - io.arenadata - java-test-common-jdk8 - ${java-test-common.version} - - - - io.arenadata java-test-common-jdk8 + ${java-test-common.version} org.postgresql @@ -176,27 +166,6 @@ - - org.apache.maven.plugins - maven-install-plugin - 3.1.4 - - io.arenadata - java-test-common-jdk8 - jar - ${basedir}/lib/java-test-common-jdk8-${java-test-common.version}.jar - false - - - - install-jar-lib - - install-file - - initialize - - - org.apache.maven.plugins maven-resources-plugin diff --git a/supports/tools/docker/multihost/docker-compose.yaml b/supports/tools/docker/multihost/docker-compose.yaml index 15e35bf3b3..a941a8b47e 100644 --- a/supports/tools/docker/multihost/docker-compose.yaml +++ b/supports/tools/docker/multihost/docker-compose.yaml @@ -203,10 +203,8 @@ services: container_name: hive-server2 hostname: hive-server2.demo depends_on: - hive-metastore: - condition: service_started - hadoop-namenode: - condition: service_healthy + - hive-metastore + - hadoop-namenode environment: SERVICE_NAME: hiveserver2 IS_RESUME: true