From 00d52935888388d11e4175b65e2ef78908ce0178 Mon Sep 17 00:00:00 2001
From: Jason Hiser <jdhiser@gmail.com>
Date: Fri, 15 Mar 2019 15:19:01 -0400
Subject: [PATCH] updates to actually run deploy from the deploy job. :)
---
.gitlab-ci.yml | 2 +-
cicd_testing/docker-zipr-bin/run_pszr.sh | 18 +++++++++++++++---
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 84f838a04..0a5bb3d93 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -165,7 +165,7 @@ elfdep-centos75:
deploy-u18:
stage: deploy
script:
- - ./cicd_testing/elfdep.sh
+ - ./cicd_testing/deploy.sh
tags:
- ubuntu18
variables:
diff --git a/cicd_testing/docker-zipr-bin/run_pszr.sh b/cicd_testing/docker-zipr-bin/run_pszr.sh
index 73b09e990..9d041e41d 100755
--- a/cicd_testing/docker-zipr-bin/run_pszr.sh
+++ b/cicd_testing/docker-zipr-bin/run_pszr.sh
@@ -17,6 +17,19 @@ print_usage()
echo ""
}
+function is_in_activation
+{
+ service "$1" status
+ activation=$(service "$1" status | grep "Active: activation" )
+ if [ -z "$activation" ]; then
+ true;
+ else
+ false;
+ fi
+
+ return $?;
+}
+
main()
{
local res=0
@@ -36,8 +49,7 @@ main()
echo
echo "Setting up postgres..."
echo
- service postgresql start
- sleep 2 # let service start up enough to print the message
+ service postgresql start
echo
echo 'The IRDB toolchain is setup and ready to run.'
echo 'You could start your first experiment with:'
@@ -56,7 +68,7 @@ main()
echo ' < ls output > '
echo 'zuser@a3fc1666aaa4:~$ readelf -l /bin/ls ./ls.p1 '
echo
- exec sudo su - zuser
+ bash
res=0
;;
--
GitLab