Commit cdfbb658 authored by Paal Kvamme's avatar Paal Kvamme
Browse files

Some devops changes to help running manual tests.

parent 29b1253b
Pipeline #43345 passed with stages
in 8 minutes and 12 seconds
...@@ -29,7 +29,7 @@ undefine NEWTOKEN ...@@ -29,7 +29,7 @@ undefine NEWTOKEN
MY_OVERRIDES = MY_OVERRIDES =
MY_OVERRIDES += $(if $(SDAPI_INTERNAL),SD_ZIPFILE=$(BUILDROOT)/seismic-service-bin/$(PLATFORM)/sdapi_linux64_local.tar.gz) MY_OVERRIDES += $(if $(SDAPI_INTERNAL),SD_ZIPFILE=$(BUILDROOT)/seismic-service-bin/$(PLATFORM)/sdapi_linux64_local.tar.gz)
.PHONY: python native wrapper build clean clobber docker-build docker-test docker noop doxygen .PHONY: python native wrapper build clean clobber docker-build docker-buildtest docker-test docker noop doxygen
all: native sdglue wrapper python all: native sdglue wrapper python
...@@ -126,6 +126,11 @@ docker-build: ...@@ -126,6 +126,11 @@ docker-build:
$(RM) cid.txt $(RM) cid.txt
docker build -t $(TAG):test -f $(DOCKERFILE)-test . docker build -t $(TAG):test -f $(DOCKERFILE)-test .
# Only valid right after docker-build, useful if experimenting
# with changes to $(DOCKERFILE)-test and nothing else.
docker-buildtest:
docker build -t $(TAG):test -f $(DOCKERFILE)-test .
docker-test: docker-test:
@echo -e '\n*** Test native started at' $$(date) @echo -e '\n*** Test native started at' $$(date)
docker run --rm -e OPENZGY_TOKEN -e OPENZGY_SDURL -e OPENZGY_SDAPIKEY $(TAG):test native/src/runtests.sh docker run --rm -e OPENZGY_TOKEN -e OPENZGY_SDURL -e OPENZGY_SDAPIKEY $(TAG):test native/src/runtests.sh
......
...@@ -32,10 +32,23 @@ RUN tar xvf build/deploy/testscripts.tar; \ ...@@ -32,10 +32,23 @@ RUN tar xvf build/deploy/testscripts.tar; \
# Enable these to allow the "test" image to run the copytimes.sh test. # Enable these to allow the "test" image to run the copytimes.sh test.
# Note that the oldtools folder has not been committed to git. # Note that the oldtools folder has not been committed to git.
#COPY oldtools/ oldtools/ #COPY oldtools/ oldtools/
#COPY private/copytimes*.sh private/ #COPY private/*.sh private/
#COPY oldtools/dropcache /usr/local/bin/dropcache #COPY oldtools/dropcache /usr/local/bin/dropcache
#RUN chmod 4555 /usr/local/bin/dropcache #RUN chmod 4555 /usr/local/bin/dropcache
# Enable running sdutil for ad-hoc tests.
#RUN dnf -y install unzip; \
# (mkdir /usr/local/sdutil; \
# cd /usr/local/sdutil; \
# unzip /home/build/oz/oldtools/sdutil-2.2.50.zip); \
# sed -i -e '1s/python$/python3/' /usr/local/sdutil/sdutil.py; \
# chmod 755 /usr/local/sdutil/sdutil.py; \
# ln -s /usr/local/sdutil/sdutil.py /usr/local/bin/sdutil; \
# pip3 install -r /usr/local/sdutil/requirements.txt; \
# mkdir /home/build/.sdcfg; \
# ln -s /host/data/slbauth.tk /home/build/.sdcfg/slbauth.tk; \
# cp -b -S .orig oldtools/config.yaml /usr/local/sdutil/sdlib/config.yaml
# Optional: Run as a regular user # Optional: Run as a regular user
RUN adduser -u 800 -g users -G wheel build; \ RUN adduser -u 800 -g users -G wheel build; \
dnf -y install sudo; \ dnf -y install sudo; \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment