Merge branch 'clean_build_directory' into 'main' (8fa9017b) · Commits · sns-hfir-scse / Infrastructure / nsd-app-wrap

.gitlab-ci.yml

+3 −4

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@ stages:
		- curl https://code.ornl.gov/rse-deployment/rse-sharables/raw/master/rse-bash-modules.sh -O
		- source rse-bash-modules.sh
		- func_rse_docker_cleanup
		- sudo chown -R gitlab-runner .


		#####
		@@ -50,6 +49,8 @@ rpmlint:
		- docker run -v $PWD/nsd-app-wrap.spec:/tmp/nsd-app-wrap.spec "${CENTOS7_IMG}" /bin/bash -c "yum install -y git rpm-build rpmlint && rpmlint /tmp/nsd-app-wrap.spec"
		after_script:
		- *teardown_cleanup
		- sudo chown -R gitlab-runner .

		tags:
		- neutrons-multi-builder

		@@ -62,6 +63,7 @@ precommit:
		- docker run -v $PWD:/tmp "${MINICONDA_IMG}" /bin/bash -c "cd /tmp && pip install pre-commit && pre-commit run --all-files"
		after_script:
		- *teardown_cleanup
		- sudo chown -R gitlab-runner .
		tags:
		- neutrons-multi-builder

		@@ -71,9 +73,6 @@ build-deploy:
		environment: $CI_COMMIT_REF_SLUG
		rules:
		- if: $CI_COMMIT_REF_PROTECTED == "true"
		before_script:
		- sudo chown -R gitlab-runner .
		- func_rse_docker_cleanup
		script:
		- *docker-login
		- docker build --build-arg SSH_KEY="$SSH_KEY" --build-arg SSH_USER="$SSH_USER" -t $IMAGE .