This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 159b0c6 HDDS-4556. Add smoketest for ozonescripts environment (#1671)
159b0c6 is described below
commit 159b0c61c3264c9c3c3e1e6e94ef853e31138557
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Thu Jan 14 15:36:36 2021 +0100
HDDS-4556. Add smoketest for ozonescripts environment (#1671)
---
.github/workflows/post-commit.yml | 1 +
.../dist/src/main/compose/ozonescripts/start.sh | 8 +++---
.../dist/src/main/compose/ozonescripts/stop.sh | 2 +-
.../main/compose/ozonescripts/{stop.sh => test.sh} | 31 +++++++++++++++++++++-
4 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/post-commit.yml
b/.github/workflows/post-commit.yml
index 14a6951..497fbce 100644
--- a/.github/workflows/post-commit.yml
+++ b/.github/workflows/post-commit.yml
@@ -199,6 +199,7 @@ jobs:
run: |
mkdir -p /mnt/ozone/hadoop-ozone/dist/target
tar xzvf hadoop-ozone*.tar.gz -C /mnt/ozone/hadoop-ozone/dist/target
+ sudo chmod -R a+rwX /mnt/ozone/hadoop-ozone/dist/target
- name: Install robotframework
run: sudo pip install robotframework
- name: Execute tests
diff --git a/hadoop-ozone/dist/src/main/compose/ozonescripts/start.sh
b/hadoop-ozone/dist/src/main/compose/ozonescripts/start.sh
index 49fc506..2ce768d 100755
--- a/hadoop-ozone/dist/src/main/compose/ozonescripts/start.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonescripts/start.sh
@@ -17,10 +17,10 @@
set -x
docker-compose ps | grep datanode | awk '{print $1}' | xargs -n1 docker
inspect --format '{{ .Config.Hostname }}' > ../../etc/hadoop/workers
docker-compose ps | grep ozonescripts | awk '{print $1}' | xargs -I CONTAINER
-n1 docker exec CONTAINER cp /opt/hadoop/etc/hadoop/workers /etc/hadoop/workers
-docker-compose exec scm /opt/hadoop/bin/ozone scm --init
-docker-compose exec scm /opt/hadoop/sbin/start-ozone.sh
+docker-compose exec -T scm /opt/hadoop/bin/ozone scm --init
+docker-compose exec -T scm /opt/hadoop/sbin/start-ozone.sh
#We need a running SCM for om objectstore creation
#TODO create a utility to wait for the startup
sleep 10
-docker-compose exec om /opt/hadoop/bin/ozone om --init
-docker-compose exec scm /opt/hadoop/sbin/start-ozone.sh
+docker-compose exec -T om /opt/hadoop/bin/ozone om --init
+docker-compose exec -T scm /opt/hadoop/sbin/start-ozone.sh
diff --git a/hadoop-ozone/dist/src/main/compose/ozonescripts/stop.sh
b/hadoop-ozone/dist/src/main/compose/ozonescripts/stop.sh
index a3ce08a..012fffb 100755
--- a/hadoop-ozone/dist/src/main/compose/ozonescripts/stop.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonescripts/stop.sh
@@ -14,4 +14,4 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-docker-compose exec scm /opt/hadoop/sbin/stop-ozone.sh
+docker-compose exec -T scm /opt/hadoop/sbin/stop-ozone.sh
diff --git a/hadoop-ozone/dist/src/main/compose/ozonescripts/stop.sh
b/hadoop-ozone/dist/src/main/compose/ozonescripts/test.sh
similarity index 60%
copy from hadoop-ozone/dist/src/main/compose/ozonescripts/stop.sh
copy to hadoop-ozone/dist/src/main/compose/ozonescripts/test.sh
index a3ce08a..6b4ef15 100755
--- a/hadoop-ozone/dist/src/main/compose/ozonescripts/stop.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonescripts/test.sh
@@ -14,4 +14,33 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-docker-compose exec scm /opt/hadoop/sbin/stop-ozone.sh
+
+#suite:misc
+
+COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+export COMPOSE_DIR
+
+export SECURITY_ENABLED=false
+export OZONE_REPLICATION_FACTOR=1
+
+# shellcheck source=/dev/null
+source "$COMPOSE_DIR/../testlib.sh"
+
+wait_for_safemode_exit() {
+ wait_for_port scm 22 30
+ wait_for_port om 22 30
+ wait_for_port datanode 22 30
+}
+
+start_docker_env 1
+
+${COMPOSE_DIR}/start.sh
+${COMPOSE_DIR}/ps.sh
+
+execute_robot_test scm admincli/pipeline.robot
+
+${COMPOSE_DIR}/stop.sh
+
+stop_docker_env
+
+generate_report
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
